[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] phpgwapi/setup setup.inc.php tables_current.inc...
|
From: |
Dave Hall |
|
Subject: |
[Phpgroupware-cvs] phpgwapi/setup setup.inc.php tables_current.inc... |
|
Date: |
Sat, 30 Sep 2006 07:09:01 +0000 |
CVSROOT: /cvsroot/phpgwapi
Module name: phpgwapi
Changes by: Dave Hall <skwashd> 06/09/30 07:09:01
Modified files:
setup : setup.inc.php tables_current.inc.php
tables_update.inc.php
Log message:
fix IPv6 support for the access_log, savannah bug #13796, debBTS #317437
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/setup/setup.inc.php?cvsroot=phpgwapi&r1=1.73&r2=1.74
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/setup/tables_current.inc.php?cvsroot=phpgwapi&r1=1.64&r2=1.65
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/setup/tables_update.inc.php?cvsroot=phpgwapi&r1=1.92&r2=1.93
Patches:
Index: setup.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/setup/setup.inc.php,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -b -r1.73 -r1.74
--- setup.inc.php 17 Sep 2006 11:36:08 -0000 1.73
+++ setup.inc.php 30 Sep 2006 07:09:01 -0000 1.74
@@ -5,20 +5,20 @@
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package phpgwapi
* @subpackage setup
- * @version $Id: setup.inc.php,v 1.73 2006/09/17 11:36:08 skwashd Exp $
+ * @version $Id: setup.inc.php,v 1.74 2006/09/30 07:09:01 skwashd Exp $
* @internal $Source: /cvsroot/phpgwapi/phpgwapi/setup/setup.inc.php,v $
*/
// Basic information about this app
$setup_info['phpgwapi']['name'] = 'phpgwapi';
$setup_info['phpgwapi']['title'] = 'phpgwapi';
- $setup_info['phpgwapi']['version'] = '0.9.17.505';
+ $setup_info['phpgwapi']['version'] = '0.9.17.506';
$setup_info['phpgwapi']['versions']['current_header'] = '1.25';
$setup_info['phpgwapi']['enable'] = 3;
$setup_info['phpgwapi']['app_order'] = 1;
// The tables this app creates
- $setup_info['phpgwapi']['tables'] = array();
+ $setup_info['phpgwapi']['tables'] =
array('phpgw_config','phpgw_applications','phpgw_acl','phpgw_acl_location','phpgw_accounts','phpgw_preferences','phpgw_sessions','phpgw_app_sessions','phpgw_access_log','phpgw_hooks','phpgw_languages','phpgw_lang','phpgw_nextid','phpgw_categories','phpgw_addressbook','phpgw_addressbook_extra','phpgw_log','phpgw_interserv','phpgw_vfs','phpgw_history_log','phpgw_async','phpgw_contact','phpgw_contact_person','phpgw_contact_org','phpgw_contact_org_person','phpgw_contact_addr','phpgw_contact_note','phpgw_contact_others','phpgw_contact_comm','phpgw_contact_comm_descr','phpgw_contact_comm_type','phpgw_contact_types','phpgw_contact_addr_type','phpgw_contact_note_type','phpgw_cust_fields','phpgw_cust_field_types','phpgw_cust_field_values','phpgw_cust_attribute','phpgw_cust_choice','phpgw_cust_function');
$setup_info['phpgwapi']['tables'][] = 'phpgw_config';
$setup_info['phpgwapi']['tables'][] = 'phpgw_applications';
$setup_info['phpgwapi']['tables'][] = 'phpgw_acl';
Index: tables_current.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/setup/tables_current.inc.php,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- tables_current.inc.php 15 Sep 2006 07:25:05 -0000 1.64
+++ tables_current.inc.php 30 Sep 2006 07:09:01 -0000 1.65
@@ -5,7 +5,7 @@
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package phpgwapi
* @subpackage setup
- * @version $Id: tables_current.inc.php,v 1.64 2006/09/15 07:25:05
sigurdne Exp $
+ * @version $Id: tables_current.inc.php,v 1.65 2006/09/30 07:09:01
skwashd Exp $
* @internal $Source:
/cvsroot/phpgwapi/phpgwapi/setup/tables_current.inc.php,v $
*/
@@ -130,7 +130,7 @@
'fd' => array(
'sessionid' => array('type' =>
'char','precision' => '32','nullable' => False),
'loginid' => array('type' =>
'varchar','precision' => '30','nullable' => False),
- 'ip' => array('type' => 'varchar','precision'
=> '30','nullable' => False),
+ 'ip' => array('type' => 'varchar','precision'
=> '50','nullable' => False,'default' => '::1'),
'li' => array('type' => 'int','precision' =>
'4','nullable' => False),
'lo' => array('type' => 'int','precision' =>
'4','nullable' => True,'default' => '0'),
'account_id' => array('type' =>
'int','precision' => '4','nullable' => False,'default' => '0')
@@ -379,7 +379,6 @@
),
'pk' => array('contact_id'),
'fk' => array(),
-// 'ix' =>
array('owner','access','contact_type_id',array('0' => True,'1' => 'cat_id','2'
=> 'contact_type_id')),
'ix' => array('owner','access','contact_type_id'),
'uc' => array()
),
@@ -435,7 +434,6 @@
),
'pk' => array('org_id','person_id'),
'fk' => array(),
-// 'ix' =>
array('addr_id','person_id','org_id','preferred',array('0' => True,'1' =>
'org_id')),
'ix' =>
array('addr_id','person_id','org_id','preferred'),
'uc' => array()
),
@@ -506,7 +504,6 @@
),
'pk' => array('comm_id'),
'fk' => array(),
-// 'ix' =>
array('comm_data','preferred','comm_descr_id','contact_id',array('0' =>
True,'1' => 'contact_id','2' => 'comm_descr_id')),
'ix' =>
array('comm_data','preferred','comm_descr_id','contact_id'),
'uc' => array()
),
@@ -570,7 +567,7 @@
'cust_field_name' => array('type' =>
'varchar','precision' => '255','nullable' => False),
'cust_field_type_id' => array('type' =>
'int','precision' => '8','nullable' => False),
'cust_field_label' => array('type' =>
'varchar','precision' => '255','nullable' => False),
- 'appname' => array('type' => 'varchar',
'precision' => 25, 'nullable' => True),
+ 'appname' => array('type' =>
'varchar','precision' => '25','nullable' => True),
'cust_field_active' => array('type' =>
'varchar','precision' => '255','nullable' => False,'default' => '1')
),
'pk' => array('cust_field_id'),
@@ -654,7 +651,6 @@
'fk' => array(),
'ix' => array(),
'uc' => array()
- ),
-
+ )
);
?>
Index: tables_update.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/setup/tables_update.inc.php,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -b -r1.92 -r1.93
--- tables_update.inc.php 14 Sep 2006 18:42:16 -0000 1.92
+++ tables_update.inc.php 30 Sep 2006 07:09:01 -0000 1.93
@@ -5,7 +5,7 @@
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package phpgwapi
* @subpackage setup
- * @version $Id: tables_update.inc.php,v 1.92 2006/09/14 18:42:16
sigurdne Exp $
+ * @version $Id: tables_update.inc.php,v 1.93 2006/09/30 07:09:01
skwashd Exp $
* @internal $Source:
/cvsroot/phpgwapi/phpgwapi/setup/tables_update.inc.php,v $
*/
@@ -1401,4 +1401,59 @@
return $GLOBALS['setup_info']['phpgwapi']['currentver'];
}
+
+
+ $test[] = '0.9.17.505';
+ function phpgwapi_upgrade0_9_17_505()
+ {
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_config','config_app',array(
+ 'type' => 'varchar',
+ 'precision' => '50'
+ ));
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_config','config_name',array(
+ 'type' => 'varchar',
+ 'precision' => '255',
+ 'nullable' => False
+ ));
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_config','config_value',array(
+ 'type' => 'text'
+ ));
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_access_log','sessionid',array(
+ 'type' => 'char',
+ 'precision' => '32',
+ 'nullable' => False
+ ));
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_access_log','loginid',array(
+ 'type' => 'varchar',
+ 'precision' => '30',
+ 'nullable' => False
+ ));
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_access_log','ip',array(
+ 'type' => 'varchar',
+ 'precision' => '50',
+ 'nullable' => False,
+ 'default' => '::1'
+ ));
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_access_log','li',array(
+ 'type' => 'int',
+ 'precision' => '4',
+ 'nullable' => False
+ ));
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_access_log','lo',array(
+ 'type' => 'int',
+ 'precision' => '4',
+ 'nullable' => True,
+ 'default' => '0'
+ ));
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_access_log','account_id',array(
+ 'type' => 'int',
+ 'precision' => '4',
+ 'nullable' => False,
+ 'default' => '0'
+ ));
+
+
+ $GLOBALS['setup_info']['phpgwapi']['currentver'] = '0.9.17.506';
+ return $GLOBALS['setup_info']['phpgwapi']['currentver'];
+ }
?>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] phpgwapi/setup setup.inc.php tables_current.inc...,
Dave Hall <=