diff --git a/addressbook/templates/default/edit.xet b/addressbook/templates/default/edit.xet index cd94c13bca..a213fc9d2a 100644 --- a/addressbook/templates/default/edit.xet +++ b/addressbook/templates/default/edit.xet @@ -48,7 +48,7 @@ - + @@ -367,7 +367,7 @@ - + diff --git a/addressbook/templates/mobile/edit.xet b/addressbook/templates/mobile/edit.xet index ec5a1784af..2ed36ef5bb 100644 --- a/addressbook/templates/mobile/edit.xet +++ b/addressbook/templates/mobile/edit.xet @@ -97,7 +97,7 @@ - + @@ -339,7 +339,7 @@ - + diff --git a/api/setup/setup.inc.php b/api/setup/setup.inc.php index 1ff6ec1931..16ffbff7a6 100644 --- a/api/setup/setup.inc.php +++ b/api/setup/setup.inc.php @@ -11,7 +11,7 @@ /* Basic information about this app */ $setup_info['api']['name'] = 'api'; $setup_info['api']['title'] = 'EGroupware API'; -$setup_info['api']['version'] = '23.1.009'; +$setup_info['api']['version'] = '23.1.010'; $setup_info['api']['versions']['current_header'] = '1.29'; // maintenance release in sync with changelog in doc/rpm-build/debian.changes $setup_info['api']['versions']['maintenance_release'] = '23.1.20241008'; @@ -140,4 +140,4 @@ $setup_info['groupdav']['author'] = $setup_info['groupdav']['maintainer'] = arra ); $setup_info['groupdav']['license'] = 'GPL'; $setup_info['groupdav']['hooks']['preferences'] = 'EGroupware\\Api\\CalDAV\\Hooks::menus'; -$setup_info['groupdav']['hooks']['settings'] = 'EGroupware\\Api\\CalDAV\\Hooks::settings'; \ No newline at end of file +$setup_info['groupdav']['hooks']['settings'] = 'EGroupware\\Api\\CalDAV\\Hooks::settings'; diff --git a/api/setup/tables_current.inc.php b/api/setup/tables_current.inc.php index 92f61a727b..c5098ad645 100644 --- a/api/setup/tables_current.inc.php +++ b/api/setup/tables_current.inc.php @@ -198,70 +198,70 @@ $phpgw_baseline = array( ), 'egw_addressbook' => array( 'fd' => array( - 'contact_id' => array('type' => 'auto','nullable' => False), - 'contact_tid' => array('type' => 'char','precision' => '1','default' => 'n'), - 'contact_owner' => array('type' => 'int','meta' => 'account','precision' => '8','nullable' => False,'comment' => 'account or group id of the adressbook'), - 'contact_private' => array('type' => 'int','precision' => '1','default' => '0','comment' => 'privat or personal'), - 'cat_id' => array('type' => 'ascii','meta' => 'category','precision' => '255','comment' => 'Category(s)'), - 'n_family' => array('type' => 'varchar','precision' => '64','comment' => 'Family name'), - 'n_given' => array('type' => 'varchar','precision' => '64','comment' => 'Given Name'), - 'n_middle' => array('type' => 'varchar','precision' => '64'), - 'n_prefix' => array('type' => 'varchar','precision' => '64','comment' => 'Prefix'), - 'n_suffix' => array('type' => 'varchar','precision' => '64','comment' => 'Suffix'), - 'n_fn' => array('type' => 'varchar','precision' => '128','comment' => 'Full name'), - 'n_fileas' => array('type' => 'varchar','precision' => '255','comment' => 'sort as'), - 'contact_bday' => array('type' => 'varchar','precision' => '12','comment' => 'Birtday'), - 'org_name' => array('type' => 'varchar','precision' => '128','comment' => 'Organisation'), - 'org_unit' => array('type' => 'varchar','precision' => '128','comment' => 'Department'), - 'contact_title' => array('type' => 'varchar','precision' => '64','comment' => 'jobtittle'), - 'contact_role' => array('type' => 'varchar','precision' => '64','comment' => 'role'), - 'contact_assistent' => array('type' => 'varchar','precision' => '64','comment' => 'Name of the Assistent (for phone number)'), - 'contact_room' => array('type' => 'varchar','precision' => '64','comment' => 'room'), - 'adr_one_street' => array('type' => 'varchar','precision' => '64','comment' => 'street (business)'), - 'adr_one_street2' => array('type' => 'varchar','precision' => '64','comment' => 'street (business) - 2. line'), - 'adr_one_locality' => array('type' => 'varchar','precision' => '64','comment' => 'city (business)'), - 'adr_one_region' => array('type' => 'varchar','precision' => '64','comment' => 'region (business)'), - 'adr_one_postalcode' => array('type' => 'varchar','precision' => '64','comment' => 'postalcode (business)'), - 'adr_one_countryname' => array('type' => 'varchar','precision' => '64','comment' => 'countryname (business)'), - 'contact_label' => array('type' => 'text','comment' => 'currently not used'), - 'adr_two_street' => array('type' => 'varchar','precision' => '64','comment' => 'street (private)'), - 'adr_two_street2' => array('type' => 'varchar','precision' => '64','comment' => 'street (private) - 2. line'), - 'adr_two_locality' => array('type' => 'varchar','precision' => '64','comment' => 'city (private)'), - 'adr_two_region' => array('type' => 'varchar','precision' => '64','comment' => 'region (private)'), - 'adr_two_postalcode' => array('type' => 'varchar','precision' => '64','comment' => 'postalcode (private)'), - 'adr_two_countryname' => array('type' => 'varchar','precision' => '64','comment' => 'countryname (private)'), - 'tel_work' => array('type' => 'varchar','precision' => '40','comment' => 'phone-number (business)'), - 'tel_cell' => array('type' => 'varchar','precision' => '40','comment' => 'mobil phone (business)'), - 'tel_fax' => array('type' => 'varchar','precision' => '40','comment' => 'fax-number (business)'), - 'tel_assistent' => array('type' => 'varchar','precision' => '40','comment' => 'phone-number assistent'), - 'tel_car' => array('type' => 'varchar','precision' => '40'), - 'tel_pager' => array('type' => 'varchar','precision' => '40','comment' => 'pager'), - 'tel_home' => array('type' => 'varchar','precision' => '40','comment' => 'phone-number (private)'), - 'tel_fax_home' => array('type' => 'varchar','precision' => '40','comment' => 'fax-number (private)'), - 'tel_cell_private' => array('type' => 'varchar','precision' => '40','comment' => 'mobil phone (private)'), - 'tel_other' => array('type' => 'varchar','precision' => '40','comment' => 'other phone'), - 'tel_prefer' => array('type' => 'varchar','precision' => '32','comment' => 'prefered phone-number'), - 'contact_email' => array('type' => 'varchar','precision' => '128','comment' => 'email address (business)'), - 'contact_email_home' => array('type' => 'varchar','precision' => '128','comment' => 'email address (private)'), - 'contact_url' => array('type' => 'varchar','precision' => '128','comment' => 'website (business)'), - 'contact_url_home' => array('type' => 'varchar','precision' => '128','comment' => 'website (private)'), - 'contact_freebusy_uri' => array('type' => 'ascii','precision' => '128','comment' => 'freebusy-url for calendar of the contact'), - 'contact_calendar_uri' => array('type' => 'ascii','precision' => '128','comment' => 'url for users calendar - currently not used'), - 'contact_note' => array('type' => 'varchar','precision' => '8192','comment' => 'notes field'), - 'contact_tz' => array('type' => 'varchar','precision' => '8','comment' => 'timezone difference'), - 'contact_geo' => array('type' => 'ascii','precision' => '32','comment' => 'currently not used'), - 'contact_pubkey' => array('type' => 'ascii','precision' => '16384','comment' => 'public key'), - 'contact_created' => array('type' => 'int','meta' => 'timestamp','precision' => '8','comment' => 'timestamp of the creation'), - 'contact_creator' => array('type' => 'int','meta' => 'user','precision' => '4','nullable' => False,'comment' => 'account id of the creator'), - 'contact_modified' => array('type' => 'int','meta' => 'timestamp','precision' => '8','nullable' => False,'comment' => 'timestamp of the last modified'), - 'contact_modifier' => array('type' => 'int','meta' => 'user','precision' => '4','comment' => 'account id of the last modified'), - 'account_id' => array('type' => 'int','meta' => 'user','precision' => '4','comment' => 'account id'), - 'contact_etag' => array('type' => 'int','precision' => '4','default' => '0','comment' => 'etag of the changes'), - 'contact_uid' => array('type' => 'ascii','precision' => '255','comment' => 'unique id of the contact'), - 'adr_one_countrycode' => array('type' => 'ascii','precision' => '2','comment' => 'countrycode (business)'), - 'adr_two_countrycode' => array('type' => 'ascii','precision' => '2','comment' => 'countrycode (private)'), - 'carddav_name' => array('type' => 'ascii','precision' => '260','comment' => 'name part of CardDAV URL, if specified by client'), - 'contact_files' => array('type' => 'int','precision' => '1','default' => '0','comment' => '&1: photo, &2: pgp, &4: smime') + 'contact_id' => array('type' => 'auto','precision' => '0','scale' => '0','nullable' => False), + 'contact_tid' => array('type' => 'char','precision' => '1','scale' => '0','default' => 'n'), + 'contact_owner' => array('type' => 'int','meta' => 'account','precision' => '8','scale' => '0','nullable' => False,'comment' => 'account or group id of the adressbook'), + 'contact_private' => array('type' => 'int','precision' => '1','scale' => '0','default' => '0','comment' => 'privat or personal'), + 'cat_id' => array('type' => 'ascii','meta' => 'category','precision' => '255','scale' => '0','comment' => 'Category(s)'), + 'n_family' => array('type' => 'varchar','precision' => '64','scale' => '0','comment' => 'Family name'), + 'n_given' => array('type' => 'varchar','precision' => '64','scale' => '0','comment' => 'Given Name'), + 'n_middle' => array('type' => 'varchar','precision' => '64','scale' => '0'), + 'n_prefix' => array('type' => 'varchar','precision' => '64','scale' => '0','comment' => 'Prefix'), + 'n_suffix' => array('type' => 'varchar','precision' => '64','scale' => '0','comment' => 'Suffix'), + 'n_fn' => array('type' => 'varchar','precision' => '128','scale' => '0','comment' => 'Full name'), + 'n_fileas' => array('type' => 'varchar','precision' => '255','scale' => '0','comment' => 'sort as'), + 'contact_bday' => array('type' => 'varchar','precision' => '12','scale' => '0','comment' => 'Birtday'), + 'org_name' => array('type' => 'varchar','precision' => '128','scale' => '0','comment' => 'Organisation'), + 'org_unit' => array('type' => 'varchar','precision' => '128','scale' => '0','comment' => 'Department'), + 'contact_title' => array('type' => 'varchar','precision' => '128','scale' => '0','comment' => 'jobtittle'), + 'contact_role' => array('type' => 'varchar','precision' => '128','scale' => '0','comment' => 'role'), + 'contact_assistent' => array('type' => 'varchar','precision' => '64','scale' => '0','comment' => 'Name of the Assistent (for phone number)'), + 'contact_room' => array('type' => 'varchar','precision' => '64','scale' => '0','comment' => 'room'), + 'adr_one_street' => array('type' => 'varchar','precision' => '64','scale' => '0','comment' => 'street (business)'), + 'adr_one_street2' => array('type' => 'varchar','precision' => '64','scale' => '0','comment' => 'street (business) - 2. line'), + 'adr_one_locality' => array('type' => 'varchar','precision' => '64','scale' => '0','comment' => 'city (business)'), + 'adr_one_region' => array('type' => 'varchar','precision' => '64','scale' => '0','comment' => 'region (business)'), + 'adr_one_postalcode' => array('type' => 'varchar','precision' => '64','scale' => '0','comment' => 'postalcode (business)'), + 'adr_one_countryname' => array('type' => 'varchar','precision' => '64','scale' => '0','comment' => 'countryname (business)'), + 'contact_label' => array('type' => 'text','precision' => '0','scale' => '0','comment' => 'currently not used'), + 'adr_two_street' => array('type' => 'varchar','precision' => '64','scale' => '0','comment' => 'street (private)'), + 'adr_two_street2' => array('type' => 'varchar','precision' => '64','scale' => '0','comment' => 'street (private) - 2. line'), + 'adr_two_locality' => array('type' => 'varchar','precision' => '64','scale' => '0','comment' => 'city (private)'), + 'adr_two_region' => array('type' => 'varchar','precision' => '64','scale' => '0','comment' => 'region (private)'), + 'adr_two_postalcode' => array('type' => 'varchar','precision' => '64','scale' => '0','comment' => 'postalcode (private)'), + 'adr_two_countryname' => array('type' => 'varchar','precision' => '64','scale' => '0','comment' => 'countryname (private)'), + 'tel_work' => array('type' => 'varchar','precision' => '40','scale' => '0','comment' => 'phone-number (business)'), + 'tel_cell' => array('type' => 'varchar','precision' => '40','scale' => '0','comment' => 'mobil phone (business)'), + 'tel_fax' => array('type' => 'varchar','precision' => '40','scale' => '0','comment' => 'fax-number (business)'), + 'tel_assistent' => array('type' => 'varchar','precision' => '40','scale' => '0','comment' => 'phone-number assistent'), + 'tel_car' => array('type' => 'varchar','precision' => '40','scale' => '0'), + 'tel_pager' => array('type' => 'varchar','precision' => '40','scale' => '0','comment' => 'pager'), + 'tel_home' => array('type' => 'varchar','precision' => '40','scale' => '0','comment' => 'phone-number (private)'), + 'tel_fax_home' => array('type' => 'varchar','precision' => '40','scale' => '0','comment' => 'fax-number (private)'), + 'tel_cell_private' => array('type' => 'varchar','precision' => '40','scale' => '0','comment' => 'mobil phone (private)'), + 'tel_other' => array('type' => 'varchar','precision' => '40','scale' => '0','comment' => 'other phone'), + 'tel_prefer' => array('type' => 'varchar','precision' => '32','scale' => '0','comment' => 'prefered phone-number'), + 'contact_email' => array('type' => 'varchar','precision' => '128','scale' => '0','comment' => 'email address (business)'), + 'contact_email_home' => array('type' => 'varchar','precision' => '128','scale' => '0','comment' => 'email address (private)'), + 'contact_url' => array('type' => 'varchar','precision' => '128','scale' => '0','comment' => 'website (business)'), + 'contact_url_home' => array('type' => 'varchar','precision' => '128','scale' => '0','comment' => 'website (private)'), + 'contact_freebusy_uri' => array('type' => 'ascii','precision' => '128','scale' => '0','comment' => 'freebusy-url for calendar of the contact'), + 'contact_calendar_uri' => array('type' => 'ascii','precision' => '128','scale' => '0','comment' => 'url for users calendar - currently not used'), + 'contact_note' => array('type' => 'varchar','precision' => '8192','scale' => '0','comment' => 'notes field'), + 'contact_tz' => array('type' => 'varchar','precision' => '8','scale' => '0','comment' => 'timezone difference'), + 'contact_geo' => array('type' => 'ascii','precision' => '32','scale' => '0','comment' => 'currently not used'), + 'contact_pubkey' => array('type' => 'ascii','precision' => '16384','scale' => '0','comment' => 'public key'), + 'contact_created' => array('type' => 'int','meta' => 'timestamp','precision' => '8','scale' => '0','comment' => 'timestamp of the creation'), + 'contact_creator' => array('type' => 'int','meta' => 'user','precision' => '4','scale' => '0','nullable' => False,'comment' => 'account id of the creator'), + 'contact_modified' => array('type' => 'int','meta' => 'timestamp','precision' => '8','scale' => '0','nullable' => False,'comment' => 'timestamp of the last modified'), + 'contact_modifier' => array('type' => 'int','meta' => 'user','precision' => '4','scale' => '0','comment' => 'account id of the last modified'), + 'account_id' => array('type' => 'int','meta' => 'user','precision' => '4','scale' => '0','comment' => 'account id'), + 'contact_etag' => array('type' => 'int','precision' => '4','scale' => '0','default' => '0','comment' => 'etag of the changes'), + 'contact_uid' => array('type' => 'ascii','precision' => '255','scale' => '0','comment' => 'unique id of the contact'), + 'adr_one_countrycode' => array('type' => 'ascii','precision' => '2','scale' => '0','comment' => 'countrycode (business)'), + 'adr_two_countrycode' => array('type' => 'ascii','precision' => '2','scale' => '0','comment' => 'countrycode (private)'), + 'carddav_name' => array('type' => 'ascii','precision' => '260','scale' => '0','comment' => 'name part of CardDAV URL, if specified by client'), + 'contact_files' => array('type' => 'int','precision' => '1','scale' => '0','default' => '0','comment' => '&1: photo, &2: pgp, &4: smime') ), 'pk' => array('contact_id'), 'fk' => array(), diff --git a/api/setup/tables_update.inc.php b/api/setup/tables_update.inc.php index 2b001f76ce..083997ba4f 100644 --- a/api/setup/tables_update.inc.php +++ b/api/setup/tables_update.inc.php @@ -1004,4 +1004,22 @@ function api_upgrade23_1_008() )); return $GLOBALS['setup_info']['api']['currentver'] = '23.1.009'; +} + +function api_upgrade23_1_009() +{ + $GLOBALS['egw_setup']->oProc->AlterColumn('egw_addressbook','contact_title',array( + 'type' => 'varchar', + 'precision' => '128', + 'scale' => '0', + 'comment' => 'jobtittle' + )); + $GLOBALS['egw_setup']->oProc->AlterColumn('egw_addressbook','contact_role',array( + 'type' => 'varchar', + 'precision' => '128', + 'scale' => '0', + 'comment' => 'role' + )); + + return $GLOBALS['setup_info']['api']['currentver'] = '23.1.010'; } \ No newline at end of file