Changeset 6528 for trunk/expressoMail1_2/setup

Timestamp:

06/15/12 17:00:17 (12 years ago)

Author:

gustavo

Message:

Ticket #2766 - Merge do branch das novas funcionalidaes para o trunk

Location:

trunk

Files:

• . (modified) (1 prop)
• expressoMail1_2/setup/default_records.inc.php (modified) (2 diffs)
• expressoMail1_2/setup/setup.inc.php (modified) (3 diffs)
• expressoMail1_2/setup/tables_current.inc.php (modified) (1 diff)
• expressoMail1_2/setup/tables_update.inc.php (modified) (1 diff)

trunk/expressoMail1_2/setup/default_records.inc.php

@@ -1 +1 @@
 <?php
+  /**************************************************************************\
+  * eGroupWare - Setup                                                       *
+  * http://www.egroupware.org                                                *
+  * --------------------------------------------                             *
+  *  This program is free software; you can redistribute it and/or modify it *
+  *  under the terms of the GNU General Public License as published by the   *
+  *  Free Software Foundation; either version 2 of the License, or (at your  *
+  *  option) any later version.                                              *
+  \**************************************************************************/
+
                         $oProc->query("ALTER TABLE expressomail_message_followupflag ADD CONSTRAINT expressomail_message_followupflag_followupflag_id_fkey FOREIGN KEY (followupflag_id) REFERENCES expressomail_followupflag (id);");
                         
@@ -15 +25 @@
                         $oProc->query("INSERT INTO phpgw_hooks( \"hook_appname\", \"hook_location\", \"hook_filename\") VALUES ('expressoMail1_2', 'config_validate', 'hook_config_validate.inc.php')");
 
-                
+                        /* Cria um indice unico para um owner e mail para nao ocorrer duplicidade em e-mails para um mesmo owner  */
+                        $oProc->query("ALTER TABLE expressomail_dynamic_contact ADD CONSTRAINT owner_mail UNIQUE (owner, mail)");
 ?>

trunk/expressoMail1_2/setup/setup.inc.php

@@ -13 +13 @@
 $setup_info['expressoMail1_2']['name'] = 'expressoMail1_2';
 $setup_info['expressoMail1_2']['title'] = 'Expresso Mail';
-$setup_info['expressoMail1_2']['version'] = '2.4.7';
+$setup_info['expressoMail1_2']['version'] = '2.4.8';
 $setup_info['expressoMail1_2']['app_order'] = 2;
-$setup_info['expressoMail1_2']['tables'][] = 'phpgw_expressomail_contacts';
 $setup_info['expressoMail1_2']['tables'][] = 'phpgw_certificados';
 
@@ -22 +21 @@
 $setup_info['expressoMail1_2']['tables'][] = 'expressomail_message_followupflag';
 $setup_info['expressoMail1_2']['tables'][] = 'expressomail_followupflag';
+$setup_info['expressoMail1_2']['tables'][] = 'expressomail_dynamic_contact';
 
 
@@ -48 +48 @@
     'versions' => Array('2.4')
 );
+
+$setup_info['expressoMail1_2']['depends'][] = array(
+    'appname' => 'rest',
+    'versions' => Array('1.0')
+);
+
 ?>

trunk/expressoMail1_2/setup/tables_current.inc.php

@@ -10 +10 @@
         \**************************************************************************/
         $phpgw_baseline = array(
-                'phpgw_expressomail_contacts' => array(
+                'expressomail_dynamic_contact' => array(
                         'fd' => array(
-                                'id_owner' => array( 'type' => 'int', 'precision' => 8, 'nullable' => false),
-                                'data' => array( 'type' => 'text')
+                                'id' => array('type' => 'auto','nullable' => False),
+                                'owner' => array('type' => 'int','precision' => '16','nullable' => False),
+                                'name' => array('type' => 'varchar','precision' => '100','nullable' => true),
+                                'mail' => array('type' => 'varchar','precision' => '100','nullable' => False),
+                                'number_of_messages' => array('type' => 'int','precision' => '16','nullable' => False),
+                                'timestamp' => array('type' => 'int','precision' => '16','nullable' => False),
                         ),
-                        'pk' => array('id_owner'),
+                        'pk' => array('id'),
                         'fk' => array(),
                         'ix' => array(),
                         'uc' => array()
                 ),
+                
         'phpgw_certificados' => array(
             'fd' => array(

trunk/expressoMail1_2/setup/tables_update.inc.php

@@ -267 +267 @@
             return $GLOBALS['setup_info']['expressoMail1_2']['currentver'];
         }
-        
+
+        $test[] = '2.4.7';
+        function expressoMail1_2_upgrade2_4_7() {
+                $oProc = $GLOBALS['phpgw_setup']->oProc;
+
+                //Criando nova tabela de contatos dinamicos
+                $oProc->CreateTable('expressomail_dynamic_contact',array(
+                        'fd' => array(
+                                'id' => array('type' => 'auto','nullable' => False),
+                                'owner' => array('type' => 'int','precision' => '16','nullable' => False),
+                                'name' => array('type' => 'varchar','precision' => '100','nullable' => true),
+                                'mail' => array('type' => 'varchar','precision' => '100','nullable' => False),
+                                'number_of_messages' => array('type' => 'int','precision' => '16','nullable' => False),
+                                'timestamp' => array('type' => 'int','precision' => '16','nullable' => False),
+                        ),
+                        'pk' => array('id'),
+                        'fk' => array(),
+                        'ix' => array(),
+                        'uc' => array()
+                        )
+                );
+
+                /* Cria um indice unico para um owner e mail para nao ocorrer duplicidade em e-mails para um mesmo owner  */
+                $oProc->query("ALTER TABLE expressomail_dynamic_contact ADD CONSTRAINT owner_mail UNIQUE (owner, mail)");
+
+                //Migra dados antigos para nova tabela
+                $oProc->query('SELECT * FROM phpgw_expressomail_contacts');
+                $return = array();
+                while($oProc->next_record())
+                        $return[$oProc->f('id_owner')] = $oProc->f('data');
+
+                foreach ($return as $owner => &$value) {
+                        $contacts = unserialize($value);
+                        foreach ($contacts as &$contact) {
+                                $info = explode('#', $contact['email']);
+                                $oProc->query("INSERT INTO expressomail_dynamic_contact (owner, name ,mail , number_of_messages ,timestamp) values ('".$owner."', '".$info[0]."', '".$info[1]."', 1, '".$contact['timestamp']."');");
+                        }
+                }
+
+                //Deleta tabela antiga
+                $oProc->DropTable('phpgw_expressomail_contacts');
+
+                /* Remove a restricao de quantidade de contatos recentes */
+                $oProc->query("DELETE FROM phpgw_config WHERE config_app = 'expressoMail1_2' AND config_name = 'expressoMail_Number_of_dynamic_contacts'");
+
+                $GLOBALS['setup_info']['expressoMail1_2']['currentver'] = '2.4.8';
+            return $GLOBALS['setup_info']['expressoMail1_2']['currentver'];
+        }
 ?>