From 410abc5fb7d922aacfe92d7177a09e55aec978e5 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Mon, 13 May 2013 09:35:51 +0000 Subject: [PATCH] * CalDAV/CardDAV/Calendar/InfoLog/Addressbook: changed database schema to allow for up to 200 char name-part in url to support eg. Bynari WebDAV Collaborator Outlook client --- calendar/setup/setup.inc.php | 3 ++- calendar/setup/tables_current.inc.php | 2 +- calendar/setup/tables_update.inc.php | 12 ++++++++++++ infolog/setup/setup.inc.php | 3 ++- infolog/setup/tables_current.inc.php | 2 +- infolog/setup/tables_update.inc.php | 13 ++++++++++++- phpgwapi/setup/setup.inc.php | 3 ++- phpgwapi/setup/tables_current.inc.php | 2 +- phpgwapi/setup/tables_update.inc.php | 12 ++++++++++++ 9 files changed, 45 insertions(+), 7 deletions(-) diff --git a/calendar/setup/setup.inc.php b/calendar/setup/setup.inc.php index 57dbcf91b4..9f5968d69c 100755 --- a/calendar/setup/setup.inc.php +++ b/calendar/setup/setup.inc.php @@ -10,7 +10,7 @@ */ $setup_info['calendar']['name'] = 'calendar'; -$setup_info['calendar']['version'] = '1.9.010'; +$setup_info['calendar']['version'] = '1.9.011'; $setup_info['calendar']['app_order'] = 3; $setup_info['calendar']['enable'] = 1; $setup_info['calendar']['index'] = 'calendar.calendar_uiviews.index'; @@ -69,3 +69,4 @@ $setup_info['calendar']['check_install'] = array( 'from' => 'Calendar', ), ); + diff --git a/calendar/setup/tables_current.inc.php b/calendar/setup/tables_current.inc.php index 02cb10bb0f..db4c4c9cb5 100644 --- a/calendar/setup/tables_current.inc.php +++ b/calendar/setup/tables_current.inc.php @@ -32,7 +32,7 @@ $phpgw_baseline = array( 'cal_recurrence' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0','comment' => 'cal_start of original recurrence for exception'), 'tz_id' => array('type' => 'int','precision' => '4','comment' => 'key into egw_cal_timezones'), 'cal_deleted' => array('type' => 'int','precision' => '8','comment' => 'ts when event was deleted'), - 'caldav_name' => array('type' => 'varchar','precision' => '64','comment' => 'name part of CalDAV URL, if specified by client'), + 'caldav_name' => array('type' => 'varchar','precision' => '200','comment' => 'name part of CalDAV URL, if specified by client'), 'range_start' => array('type' => 'int','precision' => '8','nullable' => False,'comment' => 'startdate (of range)'), 'range_end' => array('type' => 'int','precision' => '8','comment' => 'enddate (of range, UNTIL of RRULE)') ), diff --git a/calendar/setup/tables_update.inc.php b/calendar/setup/tables_update.inc.php index f3a5924a2d..0b935d340a 100644 --- a/calendar/setup/tables_update.inc.php +++ b/calendar/setup/tables_update.inc.php @@ -2279,3 +2279,15 @@ function calendar_upgrade1_9_009() return $GLOBALS['setup_info']['calendar']['currentver'] = '1.9.011'; } */ + +function calendar_upgrade1_9_010() +{ + $GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','caldav_name',array( + 'type' => 'varchar', + 'precision' => '200', + 'comment' => 'name part of CalDAV URL, if specified by client' + )); + + return $GLOBALS['setup_info']['calendar']['currentver'] = '1.9.011'; +} + diff --git a/infolog/setup/setup.inc.php b/infolog/setup/setup.inc.php index ef1ac19324..9f85c52a4d 100755 --- a/infolog/setup/setup.inc.php +++ b/infolog/setup/setup.inc.php @@ -12,7 +12,7 @@ */ $setup_info['infolog']['name'] = 'infolog'; -$setup_info['infolog']['version'] = '1.9.003'; +$setup_info['infolog']['version'] = '1.9.004'; $setup_info['infolog']['app_order'] = 5; $setup_info['infolog']['tables'] = array('egw_infolog','egw_infolog_extra'); $setup_info['infolog']['enable'] = 1; @@ -72,3 +72,4 @@ $setup_info['infolog']['depends'][] = array( 'appname' => 'etemplate', 'versions' => Array('1.7','1.8','1.9') ); + diff --git a/infolog/setup/tables_current.inc.php b/infolog/setup/tables_current.inc.php index 95d6d862d3..eb92d1f636 100644 --- a/infolog/setup/tables_current.inc.php +++ b/infolog/setup/tables_current.inc.php @@ -44,7 +44,7 @@ $phpgw_baseline = array( 'info_custom_from' => array('type' => 'int','precision' => '1','comment' => 'tick-box to show infolog_from'), 'info_uid' => array('type' => 'varchar','precision' => '255','comment' => 'unique id of the infolog-entry'), 'info_cc' => array('type' => 'varchar','precision' => '255','comment' => 'textfield for email-adress to be notified via email of changes'), - 'caldav_name' => array('type' => 'varchar','precision' => '64','comment' => 'name part of CalDAV URL, if specified by client'), + 'caldav_name' => array('type' => 'varchar','precision' => '200','comment' => 'name part of CalDAV URL, if specified by client'), 'info_etag' => array('type' => 'int','precision' => '4','default' => '0','comment' => 'etag, not yet used'), 'info_created' => array('type' => 'int','precision' => '8','comment' => 'timestamp of the creation date'), 'info_creator' => array('type' => 'int','precision' => '4','comment' => 'account id of the creator') diff --git a/infolog/setup/tables_update.inc.php b/infolog/setup/tables_update.inc.php index 1088396718..5dbaaeef3b 100644 --- a/infolog/setup/tables_update.inc.php +++ b/infolog/setup/tables_update.inc.php @@ -702,4 +702,15 @@ WHERE parent.caldav_name=sub.caldav_name',__LINE__,__FILE__) as $row) ' WHERE info_id IN ('.implode(',',$ids).')',__LINE__,__FILE__); } return $GLOBALS['setup_info']['infolog']['currentver'] = '1.9.003'; -} \ No newline at end of file +} +function infolog_upgrade1_9_003() +{ + $GLOBALS['egw_setup']->oProc->AlterColumn('egw_infolog','caldav_name',array( + 'type' => 'varchar', + 'precision' => '200', + 'comment' => 'name part of CalDAV URL, if specified by client' + )); + + return $GLOBALS['setup_info']['infolog']['currentver'] = '1.9.004'; +} + diff --git a/phpgwapi/setup/setup.inc.php b/phpgwapi/setup/setup.inc.php index caf363b4ce..e6a3ebb27d 100755 --- a/phpgwapi/setup/setup.inc.php +++ b/phpgwapi/setup/setup.inc.php @@ -12,7 +12,7 @@ /* Basic information about this app */ $setup_info['phpgwapi']['name'] = 'phpgwapi'; $setup_info['phpgwapi']['title'] = 'EGroupware API'; -$setup_info['phpgwapi']['version'] = '1.9.018'; +$setup_info['phpgwapi']['version'] = '1.9.019'; $setup_info['phpgwapi']['versions']['current_header'] = '1.29'; $setup_info['phpgwapi']['enable'] = 3; $setup_info['phpgwapi']['app_order'] = 1; @@ -74,3 +74,4 @@ $setup_info['groupdav']['author'] = $setup_info['groupdav']['maintainer'] = arra $setup_info['groupdav']['license'] = 'GPL'; $setup_info['groupdav']['hooks']['preferences'] = 'groupdav_hooks::menus'; $setup_info['groupdav']['hooks']['settings'] = 'groupdav_hooks::settings'; + diff --git a/phpgwapi/setup/tables_current.inc.php b/phpgwapi/setup/tables_current.inc.php index 9ebc3e6cc0..4138d53de0 100644 --- a/phpgwapi/setup/tables_current.inc.php +++ b/phpgwapi/setup/tables_current.inc.php @@ -343,7 +343,7 @@ $phpgw_baseline = array( 'contact_uid' => array('type' => 'varchar','precision' => '255','comment' => 'unique id of the contact'), 'adr_one_countrycode' => array('type' => 'varchar','precision' => '2','comment' => 'countrycode (business)'), 'adr_two_countrycode' => array('type' => 'varchar','precision' => '2','comment' => 'countrycode (private)'), - 'carddav_name' => array('type' => 'varchar','precision' => '64','comment' => 'name part of CardDAV URL, if specified by client') + 'carddav_name' => array('type' => 'varchar','precision' => '200','comment' => 'name part of CardDAV URL, if specified by client') ), 'pk' => array('contact_id'), 'fk' => array(), diff --git a/phpgwapi/setup/tables_update.inc.php b/phpgwapi/setup/tables_update.inc.php index 1b20828f0d..da63c861e7 100644 --- a/phpgwapi/setup/tables_update.inc.php +++ b/phpgwapi/setup/tables_update.inc.php @@ -459,3 +459,15 @@ function phpgwapi_upgrade1_9_017() return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.9.018'; } + +function phpgwapi_upgrade1_9_018() +{ + $GLOBALS['egw_setup']->oProc->AlterColumn('egw_addressbook','carddav_name',array( + 'type' => 'varchar', + 'precision' => '200', + 'comment' => 'name part of CardDAV URL, if specified by client' + )); + + return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.9.019'; +} +