Changeset 3973

Timestamp:

04/11/11 14:09:50 (13 years ago)

Author:

rafaelraymundo

Message:

Ticket #189 - Corrigidas traduções. Adicionada condicional necessária p envio do anexo

Location:

branches/2.2.0.1/calendar

Files:

• inc/class.bocalendar.inc.php (modified) (1 diff)
• setup/phpgw_pt-br.lang (modified) (previous)
• setup/tables_update.inc.php (modified) (1 diff)

branches/2.2.0.1/calendar/inc/class.bocalendar.inc.php

@@ -3473 +3473 @@
                         //Inicializa variï¿œvel de retorno.
                         $returncode=true;                       
-                        if(count($mail->to)) {                          
+                        if(count($mail->to)) {
+
+                            if(isset($new_event['attachment'])){
+                                foreach($new_event['attachment'] as $attach){
+                                    $mail->AddAttachment($attach['tmp_name'], $attach['name'], "base64", $attach['type']);
+                                }
+                            }
                                 // Envia aviso a todos os participantes.
                                 if(!$mail->Send()) {                            

branches/2.2.0.1/calendar/setup/tables_update.inc.php

@@ -80 +80 @@
                 return $GLOBALS['setup_info']['calendar']['currentver'];
         }
-        $test[] = '2.2.001';
-        function calendar_upgrade2_2_001()
-        {
-            $GLOBALS['phpgw_setup']->db->query("ALTER TABLE phpgw_cal ADD COLUMN attachment text");
-        }
-
-        $test[] = '2.2.002';
-        function calendar_upgrade2_2_002()
+        $test[] = '2.2.000';
+        function calendar_upgrade2_2_000()
         {
             $GLOBALS['phpgw_setup']->db->query("ALTER TABLE phpgw_cal ADD COLUMN alter_by varchar(160)");
-            $GLOBALS['setup_info']['calendar']['currentver'] = '2.2.003';
+            $GLOBALS['phpgw_setup']->db->query("ALTER TABLE phpgw_cal ADD COLUMN attachment text");
+            $GLOBALS['setup_info']['calendar']['currentver'] = '2.2.001';
             return $GLOBALS['setup_info']['calendar']['currentver'];
         }