diff --git a/phpgwapi/inc/class.accounts_sql.inc.php b/phpgwapi/inc/class.accounts_sql.inc.php index 5e98a802fb..ff318e2e89 100644 --- a/phpgwapi/inc/class.accounts_sql.inc.php +++ b/phpgwapi/inc/class.accounts_sql.inc.php @@ -508,7 +508,7 @@ class accounts_sql $accounts = array(); foreach((array) $GLOBALS['egw']->contacts->search($criteria, "1,n_given,n_family,email,id,created,modified,$this->table.account_id AS account_id", - $order,"account_lid,account_type,account_status,account_expires,account_primary_group", + $order,"account_lid,account_type,account_status,account_expires,account_primary_group,account_description", $wildcard,false,$query[0] == '!' ? 'AND' : 'OR', $param['offset'] ? array($param['start'], $param['offset']) : (is_null($param['start']) ? false : $param['start']), $filter,$this->contacts_join) as $contact) @@ -530,6 +530,7 @@ class accounts_sql // addressbook_bo::search() returns everything in user-time, need to convert to server-time 'account_created' => egw_time::user2server($contact['created']), 'account_modified' => egw_time::user2server($contact['modified']), + 'account_description' => $contact['account_description'], ); } } diff --git a/phpgwapi/setup/setup.inc.php b/phpgwapi/setup/setup.inc.php index 6a07aa9e5c..07188680a0 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'] = '14.2'; +$setup_info['phpgwapi']['version'] = '15.0.001'; $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']['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 e9fda853d1..efef79ecf7 100644 --- a/phpgwapi/setup/tables_current.inc.php +++ b/phpgwapi/setup/tables_current.inc.php @@ -63,7 +63,8 @@ $phpgw_baseline = array( 'account_status' => array('type' => 'char','precision' => '1','nullable' => False,'default' => 'A'), 'account_expires' => array('type' => 'int','precision' => '4'), 'account_type' => array('type' => 'char','precision' => '1'), - 'account_primary_group' => array('type' => 'int','meta' => 'group','precision' => '4','nullable' => False,'default' => '0') + 'account_primary_group' => array('type' => 'int','meta' => 'group','precision' => '4','nullable' => False,'default' => '0'), + 'account_description' => array('type' => 'varchar','precision' => '255','comment' => 'group description') ), 'pk' => array('account_id'), 'fk' => array(), diff --git a/phpgwapi/setup/tables_update.inc.php b/phpgwapi/setup/tables_update.inc.php index 94b179344b..5dd9efaa4d 100644 --- a/phpgwapi/setup/tables_update.inc.php +++ b/phpgwapi/setup/tables_update.inc.php @@ -59,4 +59,15 @@ function phpgwapi_upgrade14_1_900() $GLOBALS['egw_setup']->add_acl('phpgwapi', 'anonymous', $anonymous); return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '14.2'; -} \ No newline at end of file +} +function phpgwapi_upgrade14_2() +{ + $GLOBALS['egw_setup']->oProc->AddColumn('egw_accounts','account_description',array( + 'type' => 'varchar', + 'precision' => '255', + 'comment' => 'group description' + )); + + return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '15.0.001'; +} +