[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: calendar/setup setup.inc.php, 1.15.2.3.2.4, 1.15
|
From: |
Ralf Becker <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: calendar/setup setup.inc.php, 1.15.2.3.2.4, 1.15.2.3.2.5 tables_current.inc.php, 1.13, 1.13.4.1 tables_update.inc.php, 1.21.2.1, 1.21.2.1.2.1 |
|
Date: |
Fri, 08 Aug 2003 20:34:41 -0400 |
Update of /cvsroot/phpgroupware/calendar/setup
In directory subversions:/tmp/cvs-serv20644
Modified Files:
Tag: Version-0_9_16-branch
setup.inc.php tables_current.inc.php tables_update.inc.php
Log Message:
- implemented custom fields and sorting for the cal
- removed the phpgw_cal_alarm table
- added type field to phpgw_cal_user for resource and contacts sheduling (in
the future)
Index: setup.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/setup/setup.inc.php,v
retrieving revision 1.15.2.3.2.4
retrieving revision 1.15.2.3.2.5
diff -C2 -r1.15.2.3.2.4 -r1.15.2.3.2.5
*** setup.inc.php 22 Jul 2003 18:25:12 -0000 1.15.2.3.2.4
--- setup.inc.php 9 Aug 2003 00:34:39 -0000 1.15.2.3.2.5
***************
*** 13,17 ****
$setup_info['calendar']['name'] = 'calendar';
! $setup_info['calendar']['version'] = '0.9.13.007';
$setup_info['calendar']['app_order'] = 3;
$setup_info['calendar']['enable'] = 1;
--- 13,17 ----
$setup_info['calendar']['name'] = 'calendar';
! $setup_info['calendar']['version'] = '0.9.16.001';
$setup_info['calendar']['app_order'] = 3;
$setup_info['calendar']['enable'] = 1;
***************
*** 28,32 ****
$setup_info['calendar']['maintainer'] = array(
'name' => 'Ralf Becker',
! 'email' => 'address@hidden'
);
--- 28,32 ----
$setup_info['calendar']['maintainer'] = array(
'name' => 'Ralf Becker',
! 'email' => 'address@hidden'
);
***************
*** 35,39 ****
$setup_info['calendar']['tables'][] = 'phpgw_cal_repeats';
$setup_info['calendar']['tables'][] = 'phpgw_cal_user';
! $setup_info['calendar']['tables'][] = 'phpgw_cal_alarm';
/* The hooks this app includes, needed for hooks registration */
--- 35,39 ----
$setup_info['calendar']['tables'][] = 'phpgw_cal_repeats';
$setup_info['calendar']['tables'][] = 'phpgw_cal_user';
! $setup_info['calendar']['tables'][] = 'phpgw_cal_extra';
/* The hooks this app includes, needed for hooks registration */
***************
*** 57,59 ****
'versions' => Array('0.9.14','0.9.15','0.9.16')
);
! ?>
--- 57,61 ----
'versions' => Array('0.9.14','0.9.15','0.9.16')
);
!
!
!
Index: tables_current.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/setup/tables_current.inc.php,v
retrieving revision 1.13
retrieving revision 1.13.4.1
diff -C2 -r1.13 -r1.13.4.1
*** tables_current.inc.php 5 Nov 2001 18:17:41 -0000 1.13
--- tables_current.inc.php 9 Aug 2003 00:34:39 -0000 1.13.4.1
***************
*** 16,33 ****
'fd' => array(
'cal_id' => array('type' => 'auto','nullable'
=> False),
! 'uid' => array('type' => 'varchar', 'precision'
=> 255,'nullable' => False),
! 'owner' => array('type' => 'int', 'precision'
=> 8,'nullable' => False),
! 'category' => array('type' => 'varchar',
'precision' => 30,'nullable' => True),
! 'groups' => array('type' => 'varchar',
'precision' => 255,'nullable' => True),
! 'datetime' => array('type' => 'int',
'precision' => 8,'nullable' => True),
! 'mdatetime' => array('type' => 'int',
'precision' => 8,'nullable' => True),
! 'edatetime' => array('type' => 'int',
'precision' => 8,'nullable' => True),
! 'priority' => array('type' => 'int',
'precision' => 8,'nullable' => False,'default' => 2),
! 'cal_type' => array('type' => 'varchar',
'precision' => 10,'nullable' => True),
! 'is_public' => array('type' => 'int',
'precision' => 8,'nullable' => False,'default' => 1),
! 'title' => array('type' => 'varchar',
'precision' => 80,'nullable' => False,'default' => '1'),
'description' => array('type' =>
'text','nullable' => True),
! 'location' => array('type' => 'varchar',
'precision' => 255,'nullable' => True),
! 'reference' => array('type' => 'int',
'precision' => 8, 'nullable' => False, 'default' => 0)
),
'pk' => array('cal_id'),
--- 16,33 ----
'fd' => array(
'cal_id' => array('type' => 'auto','nullable'
=> False),
! 'uid' => array('type' => 'varchar','precision'
=> '255','nullable' => False),
! 'owner' => array('type' => 'int','precision' =>
'8','nullable' => False),
! 'category' => array('type' =>
'varchar','precision' => '30','nullable' => True),
! 'groups' => array('type' =>
'varchar','precision' => '255','nullable' => True),
! 'datetime' => array('type' => 'int','precision'
=> '8','nullable' => True),
! 'mdatetime' => array('type' =>
'int','precision' => '8','nullable' => True),
! 'edatetime' => array('type' =>
'int','precision' => '8','nullable' => True),
! 'priority' => array('type' => 'int','precision'
=> '8','nullable' => False,'default' => '2'),
! 'cal_type' => array('type' =>
'varchar','precision' => '10','nullable' => True),
! 'is_public' => array('type' =>
'int','precision' => '8','nullable' => False,'default' => '1'),
! 'title' => array('type' =>
'varchar','precision' => '80','nullable' => False,'default' => '1'),
'description' => array('type' =>
'text','nullable' => True),
! 'location' => array('type' =>
'varchar','precision' => '255','nullable' => True),
! 'reference' => array('type' =>
'int','precision' => '8','nullable' => False,'default' => '0')
),
'pk' => array('cal_id'),
***************
*** 39,49 ****
'fd' => array(
'hol_id' => array('type' => 'auto','nullable'
=> False),
! 'locale' => array('type' => 'char', 'precision'
=> 2, 'nullable' => False),
! 'name' => array('type' => 'varchar',
'precision' => 50, 'nullable' => False),
! 'mday' => array('type' => 'int', 'precision' =>
8, 'nullable' => False, 'default' => 0),
! 'month_num' => array('type' => 'int',
'precision' => 8, 'nullable' => False, 'default' => 0),
! 'occurence' => array('type' => 'int',
'precision' => 8, 'nullable' => False, 'default' => 0),
! 'dow' => array('type' => 'int', 'precision' =>
8, 'nullable' => False, 'default' => 0),
! 'observance_rule' => array('type' => 'int',
'precision' => 8, 'nullable' => False, 'default' => 0)
),
'pk' => array('hol_id'),
--- 39,49 ----
'fd' => array(
'hol_id' => array('type' => 'auto','nullable'
=> False),
! 'locale' => array('type' => 'char','precision'
=> '2','nullable' => False),
! 'name' => array('type' => 'varchar','precision'
=> '50','nullable' => False),
! 'mday' => array('type' => 'int','precision' =>
'8','nullable' => False,'default' => '0'),
! 'month_num' => array('type' =>
'int','precision' => '8','nullable' => False,'default' => '0'),
! 'occurence' => array('type' =>
'int','precision' => '8','nullable' => False,'default' => '0'),
! 'dow' => array('type' => 'int','precision' =>
'8','nullable' => False,'default' => '0'),
! 'observance_rule' => array('type' =>
'int','precision' => '8','nullable' => False,'default' => '0')
),
'pk' => array('hol_id'),
***************
*** 54,64 ****
'phpgw_cal_repeats' => array(
'fd' => array(
! 'cal_id' => array('type' => 'int', 'precision'
=> 8, 'nullable' => False),
! 'recur_type' => array('type' => 'int',
'precision' => 8, 'nullable' => False),
! 'recur_use_end' => array('type' => 'int',
'precision' => 8, 'nullable' => True, 'default' => 0),
! 'recur_enddate' => array('type' => 'int',
'precision' => 8, 'nullable' => True),
! 'recur_interval' => array('type' => 'int',
'precision' => 8, 'nullable' => True, 'default' => 1),
! 'recur_data' => array('type' => 'int',
'precision' => 8, 'nullable' => True, 'default' => 1),
! 'recur_exception' => array('type' => 'varchar',
'precision' => 255, 'nullable' => True, 'default' => '')
),
'pk' => array(),
--- 54,64 ----
'phpgw_cal_repeats' => array(
'fd' => array(
! 'cal_id' => array('type' => 'int','precision'
=> '8','nullable' => False),
! 'recur_type' => array('type' =>
'int','precision' => '8','nullable' => False),
! 'recur_use_end' => array('type' =>
'int','precision' => '8','nullable' => True,'default' => '0'),
! 'recur_enddate' => array('type' =>
'int','precision' => '8','nullable' => True),
! 'recur_interval' => array('type' =>
'int','precision' => '8','nullable' => True,'default' => '1'),
! 'recur_data' => array('type' =>
'int','precision' => '8','nullable' => True,'default' => '1'),
! 'recur_exception' => array('type' =>
'varchar','precision' => '255','nullable' => True,'default' => '')
),
'pk' => array(),
***************
*** 69,75 ****
'phpgw_cal_user' => array(
'fd' => array(
! 'cal_id' => array('type' => 'int', 'precision'
=> 8, 'nullable' => False, 'default' => 0),
! 'cal_login' => array('type' => 'int',
'precision' => 8, 'nullable' => False, 'default' => 0),
! 'cal_status' => array('type' => 'char',
'precision' => 1, 'nullable' => True, 'default' => 'A')
),
'pk' => array('cal_id','cal_login'),
--- 69,76 ----
'phpgw_cal_user' => array(
'fd' => array(
! 'cal_id' => array('type' => 'int','precision'
=> '8','nullable' => False,'default' => '0'),
! 'cal_login' => array('type' =>
'int','precision' => '8','nullable' => False,'default' => '0'),
! 'cal_status' => array('type' =>
'char','precision' => '1','nullable' => True,'default' => 'A'),
! 'cal_type' => array('type' =>
'varchar','precision' => '1','nullable' => False,'default' => '')
),
'pk' => array('cal_id','cal_login'),
***************
*** 78,91 ****
'uc' => array()
),
! 'phpgw_cal_alarm' => array(
'fd' => array(
! 'alarm_id' => array('type' => 'auto','nullable'
=> False),
! 'cal_id' => array('type' => 'int', 'precision'
=> 8, 'nullable' => False),
! 'cal_owner' => array('type' => 'int',
'precision' => 8, 'nullable' => False),
! 'cal_time' => array('type' => 'int',
'precision' => 8, 'nullable' => False),
! 'cal_text' => array('type' => 'varchar',
'precision' => 50, 'nullable' => False),
! 'alarm_enabled' => array('type' => 'int',
'precision' => 4, 'nullable' => False, 'default' => '1')
),
! 'pk' => array('alarm_id'),
'fk' => array(),
'ix' => array(),
--- 79,89 ----
'uc' => array()
),
! 'phpgw_cal_extra' => array(
'fd' => array(
! 'cal_id' => array('type' => 'int','precision'
=> '4','nullable' => False),
! 'cal_extra_name' => array('type' =>
'varchar','precision' => '40','nullable' => False),
! 'cal_extra_value' => array('type' =>
'varchar','precision' => '255','nullable' => False,'default' => '')
),
! 'pk' => array('cal_id','cal_extra_name'),
'fk' => array(),
'ix' => array(),
Index: tables_update.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/setup/tables_update.inc.php,v
retrieving revision 1.21.2.1
retrieving revision 1.21.2.1.2.1
diff -C2 -r1.21.2.1 -r1.21.2.1.2.1
*** tables_update.inc.php 19 Jan 2002 18:36:14 -0000 1.21.2.1
--- tables_update.inc.php 9 Aug 2003 00:34:39 -0000 1.21.2.1.2.1
***************
*** 914,916 ****
--- 914,945 ----
return $GLOBALS['setup_info']['calendar']['currentver'];
}
+
+
+ $test[] = '0.9.13.007';
+ function calendar_upgrade0_9_13_007()
+ {
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_cal_user','cal_type',array(
+ 'type' => 'varchar',
+ 'precision' => '1',
+ 'nullable' => False,
+ 'default' => ''
+ ));
+
+
$GLOBALS['phpgw_setup']->oProc->CreateTable('phpgw_cal_extra',array(
+ 'fd' => array(
+ 'cal_id' => array('type' => 'int','precision'
=> '4','nullable' => False),
+ 'cal_extra_name' => array('type' =>
'varchar','precision' => '40','nullable' => False),
+ 'cal_extra_value' => array('type' =>
'varchar','precision' => '255','nullable' => False,'default' => '')
+ ),
+ 'pk' => array('cal_id','cal_extra_name'),
+ 'fk' => array(),
+ 'ix' => array(),
+ 'uc' => array()
+ ));
+
+ $GLOBALS['phpgw_setup']->oProc->DropTable('phpgw_cal_alarm');
+
+ $GLOBALS['setup_info']['calendar']['currentver'] = '0.9.16.001';
+ return $GLOBALS['setup_info']['calendar']['currentver'];
+ }
?>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: calendar/setup setup.inc.php, 1.15.2.3.2.4, 1.15.2.3.2.5 tables_current.inc.php, 1.13, 1.13.4.1 tables_update.inc.php, 1.21.2.1, 1.21.2.1.2.1,
Ralf Becker <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: calendar/templates/default custom_fields.tpl, NONE, 1.1.2.1
- Next by Date:
[Phpgroupware-cvs] CVS: calendar/inc class.bocustom_fields.inc.php, NONE, 1.1.2.1 class.uicustom_fields.inc.php, NONE, 1.1.2.1 class.bocalendar.inc.php, 1.71.2.33.2.12, 1.71.2.33.2.13 class.socalendar_sql.inc.php, 1.28.2.4.2.3, 1.28.2.4.2.4 class.uicalendar.inc.php, 1.66.2.55.2.15, 1.66.2.55.2.16 hook_admin.inc.php, 1.7.2.1, 1.7.2.1.2.1 hook_sidebox_menu.inc.php, 1.1.2.4, 1.1.2.5
- Previous by thread:
[Phpgroupware-cvs] CVS: calendar/templates/default custom_fields.tpl, NONE, 1.1.2.1
- Next by thread:
[Phpgroupware-cvs] CVS: calendar/inc class.bocustom_fields.inc.php, NONE, 1.1.2.1 class.uicustom_fields.inc.php, NONE, 1.1.2.1 class.bocalendar.inc.php, 1.71.2.33.2.12, 1.71.2.33.2.13 class.socalendar_sql.inc.php, 1.28.2.4.2.3, 1.28.2.4.2.4 class.uicalendar.inc.php, 1.66.2.55.2.15, 1.66.2.55.2.16 hook_admin.inc.php, 1.7.2.1, 1.7.2.1.2.1 hook_sidebox_menu.inc.php, 1.1.2.4, 1.1.2.5
- Index(es):