|
@@ 934-940 (lines=7) @@
|
| 931 |
|
{ |
| 932 |
|
$selects[] = $select; |
| 933 |
|
$selects[count($selects)-1]['where'][] = $user_sql; |
| 934 |
|
if ($params['enum_recuring']) |
| 935 |
|
{ |
| 936 |
|
$selects[count($selects)-1]['where'][] = "recur_type IS NULL AND $this->user_table.cal_recur_date=0"; |
| 937 |
|
$selects[] = $select; |
| 938 |
|
$selects[count($selects)-1]['where'][] = $user_sql; |
| 939 |
|
$selects[count($selects)-1]['where'][] = "$this->user_table.cal_recur_date=cal_start"; |
| 940 |
|
} |
| 941 |
|
} |
| 942 |
|
// if the query is to be filtered by owner we need to add more selects for the union |
| 943 |
|
if ($owner_or) |
|
@@ 947-953 (lines=7) @@
|
| 944 |
|
{ |
| 945 |
|
$selects[] = $select; |
| 946 |
|
$selects[count($selects)-1]['where'][] = $owner_or; |
| 947 |
|
if ($params['enum_recuring']) |
| 948 |
|
{ |
| 949 |
|
$selects[count($selects)-1]['where'][] = "recur_type IS NULL AND $this->user_table.cal_recur_date=0"; |
| 950 |
|
$selects[] = $select; |
| 951 |
|
$selects[count($selects)-1]['where'][] = $owner_or; |
| 952 |
|
$selects[count($selects)-1]['where'][] = "$this->user_table.cal_recur_date=cal_start"; |
| 953 |
|
} |
| 954 |
|
} |
| 955 |
|
} |
| 956 |
|
else |
EGroupware /
egroupware
