extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-26 01:43:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

phpgw_addressbook(_extra) --> egw_addressbook(_extra)

Browse Source
This commit is contained in:
Ralf Becker 2005-11-13 12:05:35 +00:00
parent f65d804916
commit 8e25d2e29c
6 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addressbook/inc/class.socontacts.inc.php
View File

@ -31,7 +31,7 @@ class socontacts
/** /**
* @var string $extra_table name of customefields table * @var string $extra_table name of customefields table
*/ */
var $extra_table = 'phpgw_addressbook_extra'; var $extra_table = 'egw_addressbook_extra';
/** /**
* @var string $extra_id * @var string $extra_id
@ -57,7 +57,7 @@ class socontacts
{ {
if($GLOBALS['egw_info']['server']['contact_repository'] == 'sql' || !isset($GLOBALS['egw_info']['server']['contact_repository'])) if($GLOBALS['egw_info']['server']['contact_repository'] == 'sql' || !isset($GLOBALS['egw_info']['server']['contact_repository']))
{ {
$this->somain =& CreateObject('etemplate.so_sql','phpgwapi','phpgw_addressbook'); $this->somain =& CreateObject('etemplate.so_sql','phpgwapi','egw_addressbook');
} }
else else
{ {

2
phpgwapi/inc/class.contacts_ldap.inc.php
View File

@ -39,7 +39,7 @@
var $ldap = ''; var $ldap = '';
var $nextid = ''; var $nextid = '';
var $std_table = ''; var $std_table = '';
var $ext_table = 'phpgw_addressbook_extra'; var $ext_table = 'egw_addressbook_extra';
var $account_id; var $account_id;
var $adr_types; var $adr_types;

6
phpgwapi/inc/class.contacts_sql.inc.php
View File

@ -44,8 +44,8 @@
class contacts_ class contacts_
{ {
var $db = ''; var $db = '';
var $std_table='phpgw_addressbook'; var $std_table='egw_addressbook';
var $ext_table='phpgw_addressbook_extra'; var $ext_table='egw_addressbook_extra';
var $account_id = 0; var $account_id = 0;
var $total_records = 0; var $total_records = 0;
@ -670,7 +670,7 @@
list($stock_fields,,$extra_fields) = $this->split_stock_and_extras($fields); list($stock_fields,,$extra_fields) = $this->split_stock_and_extras($fields);
// access, cat_id and tid can be in $fields now or as extra params // access, cat_id and tid can be in $fields now or as extra params
foreach(array('access','cat_id','tid') as $extra) foreach(array('access','cat_id','tid','owner') as $extra)
{ {
if (!is_null($$extra)) if (!is_null($$extra))
{ {

6
phpgwapi/setup/setup.inc.php
View File

@ -14,7 +14,7 @@
/* Basic information about this app */ /* Basic information about this app */
$setup_info['phpgwapi']['name'] = 'phpgwapi'; $setup_info['phpgwapi']['name'] = 'phpgwapi';
$setup_info['phpgwapi']['title'] = 'eGroupWare API'; $setup_info['phpgwapi']['title'] = 'eGroupWare API';
$setup_info['phpgwapi']['version'] = '1.0.1.028'; $setup_info['phpgwapi']['version'] = '1.0.1.029';
$setup_info['phpgwapi']['versions']['current_header'] = '1.28'; $setup_info['phpgwapi']['versions']['current_header'] = '1.28';
$setup_info['phpgwapi']['enable'] = 3; $setup_info['phpgwapi']['enable'] = 3;
$setup_info['phpgwapi']['app_order'] = 1; $setup_info['phpgwapi']['app_order'] = 1;
@ -33,8 +33,8 @@
$setup_info['phpgwapi']['tables'][] = 'egw_lang'; $setup_info['phpgwapi']['tables'][] = 'egw_lang';
$setup_info['phpgwapi']['tables'][] = 'egw_nextid'; $setup_info['phpgwapi']['tables'][] = 'egw_nextid';
$setup_info['phpgwapi']['tables'][] = 'egw_categories'; $setup_info['phpgwapi']['tables'][] = 'egw_categories';
$setup_info['phpgwapi']['tables'][] = 'phpgw_addressbook'; $setup_info['phpgwapi']['tables'][] = 'egw_addressbook';
$setup_info['phpgwapi']['tables'][] = 'phpgw_addressbook_extra'; $setup_info['phpgwapi']['tables'][] = 'egw_addressbook_extra';
$setup_info['phpgwapi']['tables'][] = 'egw_log'; $setup_info['phpgwapi']['tables'][] = 'egw_log';
$setup_info['phpgwapi']['tables'][] = 'egw_log_msg'; $setup_info['phpgwapi']['tables'][] = 'egw_log_msg';
$setup_info['phpgwapi']['tables'][] = 'egw_interserv'; $setup_info['phpgwapi']['tables'][] = 'egw_interserv';

4
phpgwapi/setup/tables_current.inc.php
View File

@ -189,7 +189,7 @@
'ix' => array(array('cat_appname','cat_owner','cat_parent','cat_level')), 'ix' => array(array('cat_appname','cat_owner','cat_parent','cat_level')),
'uc' => array() 'uc' => array()
), ),
'phpgw_addressbook' => array( 'egw_addressbook' => array(
'fd' => array( 'fd' => array(
'id' => array('type' => 'auto','nullable' => False), 'id' => array('type' => 'auto','nullable' => False),
'lid' => array('type' => 'varchar','precision' => '32'), 'lid' => array('type' => 'varchar','precision' => '32'),
@ -250,7 +250,7 @@
'ix' => array(array('tid','owner','access','n_family','n_given','email'),array('tid','cat_id','owner','access','n_family','n_given','email')), 'ix' => array(array('tid','owner','access','n_family','n_given','email'),array('tid','cat_id','owner','access','n_family','n_given','email')),
'uc' => array() 'uc' => array()
), ),
'phpgw_addressbook_extra' => array( 'egw_addressbook_extra' => array(
'fd' => array( 'fd' => array(
'contact_id' => array('type' => 'int','precision' => '4','nullable' => False), 'contact_id' => array('type' => 'int','precision' => '4','nullable' => False),
'contact_owner' => array('type' => 'int','precision' => '8'), 'contact_owner' => array('type' => 'int','precision' => '8'),

10
phpgwapi/setup/tables_update.inc.php
View File

@ -897,4 +897,14 @@
return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.0.1.028'; return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.0.1.028';
} }
$test[] = '1.0.1.028';
function phpgwapi_upgrade1_0_1_028()
{
$GLOBALS['egw_setup']->oProc->RenameTable('phpgw_addressbook','egw_addressbook');
$GLOBALS['egw_setup']->oProc->RenameTable('phpgw_addressbook_extra','egw_addressbook_extra');
return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.0.1.029';
}
?> ?>