Changeset 1065

Timestamp:

07/01/09 09:11:31 (15 years ago)

Author:

amuller

Message:

Ticket #559 - Correção de problema ocasionado nas imagens pelos comits deste ticket

Location:

trunk/expressoMail1_2/inc

Files:

• class.imap_functions.inc.php (modified) (5 diffs)
• gotodownload.php (modified) (1 diff)

trunk/expressoMail1_2/inc/class.imap_functions.inc.php

@@ -1799 +1799 @@
                                 }
                                 $tempDir = ini_get("session.save_path");
-                                $file = "cidimage_".$GLOBALS['phpgw']->session->sessionid.".dat";                                       
+                                $file = "cidimage_".$_SESSION[ 'phpgw_session' ][ 'session_id' ].$cid_imgs[6][$j].".dat";       
                                 $f = fopen($tempDir.'/'.$file,"w");
                                 fputs($f,$fileContent);
@@ -2311 +2311 @@
                                 }
                                 $tempDir = ini_get("session.save_path");
-                                $file = "cidimage_".$GLOBALS['phpgw']->session->sessionid.".dat";                                       
+                                $file = "cidimage_".$_SESSION[ 'phpgw_session' ][ 'session_id' ].$cid_imgs[6][$j].".dat";                                       
                                 $f = fopen($tempDir.'/'.$file,"w");
                                 fputs($f,$fileContent);
@@ -2362 +2362 @@
                                         case 3: $image_big = imagecreatefrompng($attach['tmp_name']); break;
                                         case 6:
-                                                include_once("gd_functions.php");
+                                                require_once("gd_functions.php");
                                                 $image_big = imagecreatefrombmp($attach['tmp_name']); break;
                                         default:
@@ -2386 +2386 @@
                                         imagecopyresampled($image_new, $image_big, 0, 0, 0, 0, $new_width, $new_height, $width, $height);
                                         $tmpDir = ini_get("session.save_path");
-                                        $_file = "cidimage_".$GLOBALS['phpgw']->session->sessionid.".dat"; 
+                                        $_file = "cidimage_".$_SESSION[ 'phpgw_session' ][ 'session_id' ].".dat"; 
                                         imagejpeg($image_new,$tmpDir.$_file, 85);
                                         $mail->AddAttachment($tmpDir.$_file, $attach['name'], "base64", $this->get_file_type($tmpDir.$_file));
@@ -3259 +3259 @@
         if($timestamp){
             $tempDir = ini_get("session.save_path");
-            $file = $tempDir."imap_".$GLOBALS['phpgw']->session->sessionid;
+            $file = $tempDir."imap_".$_SESSION[ 'phpgw_session' ][ 'session_id' ];
                 $f = fopen($file,"w");
                 fputs($f,base64_encode($source));

trunk/expressoMail1_2/inc/gotodownload.php

@@ -167 +167 @@
                 }
                 else
-                        if (preg_match("#^".ini_get('session.save_path')."/[A-z]+_".$GLOBALS['phpgw']->session->sessionid."(\.[A-z]{3,4})?$#",$strFileName))
+                        if (preg_match("#^".ini_get('session.save_path')."/[A-z]+_".$GLOBALS['phpgw']->session->sessionid."[A-z0-9]*(\.[A-z]{3,4})?$#",$strFileName))
                         {
                                 readfile($strFileName);