Changeset 5388

Timestamp:

01/17/12 17:18:42 (12 years ago)

Author:

gustavo

Message:

Ticket #2434 - correcao na importacaode eventos via expressoMail para a nova agenda

File:

• trunk/expressoMail1_2/inc/class.db_functions.inc.php (modified) (4 diffs)

trunk/expressoMail1_2/inc/class.db_functions.inc.php

@@ -363 +363 @@
         
         function import_vcard($params){
-                        
-                include_once('class.imap_functions.inc.php');
-                $objImap = new imap_functions();
-                $msg_number = $params['msg_number'];
-                $idx_file = $params['idx_file'];
-                $msg_part = $params['msg_part'];
-                $msg_folder = $params['msg_folder'];
+            include_once('class.imap_functions.inc.php');
+            $objImap = new imap_functions();
+            $msg_number = $params['msg_number'];
+            $idx_file = $params['idx_file'];
+            $msg_part = $params['msg_part'];
+            $msg_folder = $params['msg_folder'];
             $from_ajax = $params['from_ajax'];
-                $encoding = strtolower($params['encoding']);
-                $fileContent = "";
+            $encoding = strtolower($params['encoding']);
+            $fileContent = "";
             $cirus_delimiter = $params['cirus_delimiter'];
             $expFolder = explode($cirus_delimiter, $msg_folder);
@@ -378 +377 @@
             if($msg_number != null && $msg_part != null && $msg_folder != null && (intval($idx_file == '0' ? '1' : $idx_file)))
             {
-                require_once dirname(__FILE__).'/class.attachment.inc.php';
+                require_once PHPGW_INCLUDE_ROOT.'/expressoMail1_2/inc/class.attachment.inc.php';
                 $attachmentObj = new attachment();
                 $attachmentObj->setStructureFromMail($msg_folder,$msg_number);
@@ -384 +383 @@
                 $info = $attachmentObj->getAttachmentInfo($msg_part);
                 $filename = $info['name'];
-                }
-                else
-                        $filename = $idx_file;
-                                        
-                // It's necessary to access calendar method. 
+            }
+            else
+                    $filename = $idx_file;
+                    
+            // It's necessary to access calendar method.
             $GLOBALS['phpgw_info']['flags']['noappheader'] = True;
             $GLOBALS['phpgw_info']['flags']['noappfooter'] = True;
             $GLOBALS['phpgw_info']['flags']['currentapp'] = 'calendar';
-                include_once(PHPGW_INCLUDE_ROOT.'/header.inc.php'); 
-                $uiicalendar = CreateObject("calendar.uiicalendar");
-
+            include_once(PHPGW_INCLUDE_ROOT.'/header.inc.php');
+            $uiicalendar = CreateObject("calendar.uiicalendar");
+                        if($params['selected'] || $params['readable']){
+                                $_REQUEST['data'] = $fileContent;
+                                $_REQUEST['type'] = 'iCal';
+                                $_REQUEST['params']['calendar'] = $params['selected'];
+                                $_REQUEST['readable'] = $params['readable'] ? true : false;
+                                $_REQUEST['params']['status'] = $params['status'];
+                                $_REQUEST['params']['owner'] = $_SESSION['phpgw_info']['expressomail']['user']['account_id'];
+                                ob_start();
+                                include_once(PHPGW_INCLUDE_ROOT.'/prototype/converter.php');
+                                $output = ob_get_clean();                       
+                                $valid = json_decode($output, true);
+
+
+                                if($_REQUEST['readable']){      
+                                        if(!$valid)
+                                        {
+                                                $return = false;
+                                                $output = unserialize($output);
+                                                foreach($output[0] as $key => $value){
+                                                        if(array_key_exists("id",$output[0][$key]))
+                                                                $return = true;
+                                                }
+                                                return $return;
+                                        }
+                                        return false;
+                                }
+
+                                if(empty($valid))
+                                        return "error"; 
+                                return "ok";
+                        }
             if(strtoupper($expFolder[0]) == 'USER' && $expFolder[1]) // IF se a conta o ical estiver em uma conta compartilhada
             {
@@ -407 +436 @@
             else
                 return $uiicalendar->import_from_mail($fileContent, $from_ajax);
-            
-            
+
         }