Changeset 5982

Timestamp:

04/20/12 15:21:49 (12 years ago)

Author:

douglasz

Message:

Ticket #2633 - Adequar implementação de flags de marcadores e sinalizadores no IMAP.

Location:

trunk/expressoMail1_2/setup

Files:

• default_records.inc.php (modified) (1 diff)
• tables_update.inc.php (modified) (2 diffs)

trunk/expressoMail1_2/setup/default_records.inc.php

@@ -8 +8 @@
                         $oProc->query("INSERT INTO expressomail_followupflag(name) VALUES ('Don''t forward');");
                         $oProc->query("INSERT INTO expressomail_followupflag(name) VALUES ('Don''t answer');");
-                        
-                        //Insert reservados para as labels padrões referentes ao thunderbir
-                        $oProc->query("INSERT INTO expressomail_label(name, font_color, border_color, background_color) VALUES ('Important', '#ff0000', '#ff0000', '#ffffff');"); 
-                        $oProc->query("INSERT INTO expressomail_label(name, font_color, border_color, background_color) VALUES ('Work', '#ff9900', '#ff9900', '#ffffff');"); 
-                        $oProc->query("INSERT INTO expressomail_label(name, font_color, border_color, background_color) VALUES ('personal', '#009900', '#009900', '#ffffff');"); 
-                        $oProc->query("INSERT INTO expressomail_label(name, font_color, border_color, background_color) VALUES ('todo', '#3333ff', '#3333ff', '#ffffff');"); 
-                        $oProc->query("INSERT INTO expressomail_label(name, font_color, border_color, background_color) VALUES ('later', '#993399', '#993399', '#ffffff');");
-                        
+                                                
                         /* Seta o valor padrão para a configuração de número máximo de marcadores */
                         $oProc->query("INSERT INTO phpgw_config(config_app, config_name, config_value) VALUES ('expressoMail1_2', 'expressoMail_limit_labels', 20);");

trunk/expressoMail1_2/setup/tables_update.inc.php

@@ -197 +197 @@
                         $oProc->query("INSERT INTO expressomail_followupflag(name) VALUES ('Don''t answer');");
                         
-                        //Insert reservados para as labels padrões referentes ao thunderbir
-                        $oProc->query("INSERT INTO expressomail_label(name, font_color, border_color, background_color) VALUES ('Important', '#ff0000', '#ff0000', '#ffffff');"); 
-                        $oProc->query("INSERT INTO expressomail_label(name, font_color, border_color, background_color) VALUES ('Work', '#ff9900', '#ff9900', '#ffffff');"); 
-                        $oProc->query("INSERT INTO expressomail_label(name, font_color, border_color, background_color) VALUES ('personal', '#009900', '#009900', '#ffffff');"); 
-                        $oProc->query("INSERT INTO expressomail_label(name, font_color, border_color, background_color) VALUES ('todo', '#3333ff', '#3333ff', '#ffffff');"); 
-                        $oProc->query("INSERT INTO expressomail_label(name, font_color, border_color, background_color) VALUES ('later', '#993399', '#993399', '#ffffff');");
-                        
                         /* Seta o valor padrão para a configuração de número máximo de marcadores */
                         $oProc->query("INSERT INTO phpgw_config(config_app, config_name, config_value) VALUES ('expressoMail1_2', 'expressoMail_limit_labels', 20);");
@@ -254 +247 @@
         function expressoMail1_2_upgrade2_4_4() {
             $oProc = $GLOBALS['phpgw_setup']->oProc;
-            $oProc->query("ALTER TABLE expressomail_label ADD COLUMN slot bigint not null default 'unknown' ");
+                $oProc->query("DELETE FROM expressomail_label");
+            $oProc->query("ALTER TABLE expressomail_label ADD COLUMN slot bigint not null");
  
             $GLOBALS['setup_info']['expressoMail1_2']['currentver'] = '2.4.5';