[Phpgroupware-cvs] calendar/setup setup.inc.php, 1.32 tables_current.inc.php, 1.17 tables_update.inc.php, 1.26

[skwashd]

Update of calendar/setup

Modified Files:
     Branch: MAIN
            setup.inc.php lines: +3 -2
            tables_current.inc.php lines: +1 -2
            tables_update.inc.php lines: +33 -5

Log Message:
fixed ical export and switched to db pk identifiers for the UID

====================================================
Index: calendar/setup/setup.inc.php
diff -u calendar/setup/setup.inc.php:1.31 calendar/setup/setup.inc.php:1.32
--- calendar/setup/setup.inc.php:1.31   Sun Oct 23 12:57:16 2005
+++ calendar/setup/setup.inc.php        Fri Nov 18 11:40:45 2005
@@ -12,7 +12,7 @@
        /* $Id$ */

        $setup_info['calendar']['name']    = 'calendar';
-       $setup_info['calendar']['version'] = '0.9.18.001';
+       $setup_info['calendar']['version'] = '0.9.18.002';
        $setup_info['calendar']['app_order'] = 3;
        $setup_info['calendar']['enable']  = 1;

@@ -56,6 +56,7 @@
                 'appname' => 'phpgwapi',
                 'versions' => Array('0.9.16','0.9.17','0.9.18')
        );
+




====================================================
Index: calendar/setup/tables_current.inc.php
diff -u calendar/setup/tables_current.inc.php:1.16 
calendar/setup/tables_current.inc.php:1.17
--- calendar/setup/tables_current.inc.php:1.16  Sun May 15 06:57:37 2005
+++ calendar/setup/tables_current.inc.php       Fri Nov 18 11:40:45 2005
@@ -15,7 +15,6 @@
                'phpgw_cal' => array(
                        '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),

====================================================
Index: calendar/setup/tables_update.inc.php
diff -u calendar/setup/tables_update.inc.php:1.25 
calendar/setup/tables_update.inc.php:1.26
--- calendar/setup/tables_update.inc.php:1.25   Sun Oct 23 12:57:16 2005
+++ calendar/setup/tables_update.inc.php        Fri Nov 18 11:40:45 2005
@@ -978,9 +978,6 @@

                foreach ( $owner_map as $event_id => $acct_id )
                {
-                       echo "[calendar][info] Updating event #{$event_id} 
owner from account id {$acct_id} to contact id {$acct_contacts[$acct_id]}<br 
/>";
-
-
                        $GLOBALS['phpgw_setup']->db->query('UPDATE phpgw_cal'
                                                                . " SET owner = 
{$acct_contacts[$acct_id]}"
                                                                . " WHERE 
cal_id = {$event_id}"
@@ -989,7 +986,6 @@

                foreach ( $acct_contacts as $acct_id => $contact_id )
                {
-                       echo "[calendar][info] Updating event participant user 
id {$acct_id} to contact id {$contact_id}<br />\n";
                        $GLOBALS['phpgw_setup']->db->query('UPDATE 
phpgw_cal_user'
                                                                . " SET 
cal_login = {$contact_id}, rec_updated = 1"
                                                                . " WHERE 
cal_login = {$acct_id}"
@@ -1012,6 +1008,38 @@
                ),'rec_updated');

                $GLOBALS['setup_info']['calendar']['currentver'] = '0.9.18.000';
+               return $GLOBALS['setup_info']['calendar']['currentver'];
+       }
+
+
+       $test[] = '0.9.18.001';
+       function calendar_upgrade0_9_18_001()
+       {
+               $GLOBALS['phpgw_setup']->oProc->DropColumn('phpgw_cal',array(
+                       'fd' => array(
+                               'cal_id' => array('type' => 'auto','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'),
+                       'fk' => array(),
+                       'ix' => array(),
+                       'uc' => array()
+               ),'uid');
+
+
+               $GLOBALS['setup_info']['calendar']['currentver'] = '0.9.18.002';
                return $GLOBALS['setup_info']['calendar']['currentver'];
        }
 ?>