|
@@ 1643-1655 (lines=13) @@
|
| 1640 |
|
{ |
| 1641 |
|
// Set UID of series exception to UID of series master |
| 1642 |
|
// update cal_etag, cal_modified and cal_modifier to distribute changes on GroupDAV devices |
| 1643 |
|
foreach($GLOBALS['egw_setup']->db->query(' |
| 1644 |
|
SELECT cal_ex.cal_id,cal_ex.cal_uid AS cal_uid_ex,cal_master.cal_uid AS cal_uid_master |
| 1645 |
|
FROM egw_cal cal_ex |
| 1646 |
|
JOIN egw_cal cal_master ON cal_ex.cal_reference=cal_master.cal_id |
| 1647 |
|
WHERE cal_ex.cal_reference != 0',__LINE__,__FILE__) as $row) |
| 1648 |
|
{ |
| 1649 |
|
if (strlen($row['cal_uid_master']) > 0 && $row['cal_uid_ex'] != $row['cal_uid_master']) |
| 1650 |
|
{ |
| 1651 |
|
$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET cal_uid=\''.$row['cal_uid_master']. |
| 1652 |
|
'\',cal_etag=cal_etag+1,cal_modified='.time(). |
| 1653 |
|
',cal_modifier=NULL WHERE cal_id='.(int)$row['cal_id'],__LINE__,__FILE__); |
| 1654 |
|
} |
| 1655 |
|
} |
| 1656 |
|
|
| 1657 |
|
// Search series exception for nearest exception in series master and add that RECURRENCE-ID |
| 1658 |
|
// as cal_reference (for 1.6.003 and move it to new field cal_recurrence in 1.7.001) |
|
@@ 1929-1941 (lines=13) @@
|
| 1926 |
|
{ |
| 1927 |
|
// Set UID of series exception to UID of series master |
| 1928 |
|
// update cal_etag,cal_modified and cal_modifier to distribute changes on GroupDAV devices |
| 1929 |
|
foreach($GLOBALS['egw_setup']->db->query(' |
| 1930 |
|
SELECT cal_ex.cal_id,cal_ex.cal_uid AS cal_uid_ex,cal_master.cal_uid AS cal_uid_master |
| 1931 |
|
FROM egw_cal cal_ex |
| 1932 |
|
JOIN egw_cal cal_master ON cal_ex.cal_reference=cal_master.cal_id |
| 1933 |
|
WHERE cal_ex.cal_reference != 0',__LINE__,__FILE__) as $row) |
| 1934 |
|
{ |
| 1935 |
|
if (strlen($row['cal_uid_master']) > 0 && $row['cal_uid_ex'] != $row['cal_uid_master']) |
| 1936 |
|
{ |
| 1937 |
|
$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET cal_uid=\''.$row['cal_uid_master']. |
| 1938 |
|
'\',cal_etag=cal_etag+1,cal_modified='.time(). |
| 1939 |
|
',cal_modifier=NULL WHERE cal_id='.(int)$row['cal_id'],__LINE__,__FILE__); |
| 1940 |
|
} |
| 1941 |
|
} |
| 1942 |
|
return $GLOBALS['setup_info']['calendar']['currentver'] = '1.7.008'; |
| 1943 |
|
} |
| 1944 |
|
|