bugfix

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@2560 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/functions/smtp.php b/functions/smtp.php
index 0730b2aa452095f256e4cc0765c43e6ee74554ef..1e5395857566865e61ff9e3d1ecd1fac88b96f5a 100644 (file)
--- a/functions/smtp.php
+++ b/functions/smtp.php
@@ -34,18 +34,13 @@ if (!$domain) {
 /* Returns true only if this message is multipart */
 function isMultipart ($session) {
     global $attachments;
 /* Returns true only if this message is multipart */
 function isMultipart ($session) {
     global $attachments;

-    return true;
-/*    
-    if (count($attachments)>0) {
-       for ($i=0 ; $i < count($attachments) ; $i++) {
-           if ($attachments[$i]->session == $session) {
-               return true;
-           }
+
+    foreach ($attachments as $info) {
+       if ($info['session'] == $session) {
+           return true;

        }
        }

-    } else {
-        return false;

     }
     }

-*/
+    return false;

 }
 
 /* looks up aliases in the addressbook and expands them to
 }
 
 /* looks up aliases in the addressbook and expands them to


@@ -200,24 +195,6 @@ function deleteAttachments($session) {
     $attachments = $rem_attachments;
 }
 
     $attachments = $rem_attachments;
 }
 

-
-
-    
-//    $hashed_attachment_dir = getHashedDir($username, $attachment_dir);
-//    if (isMultipart($ses)) {
-//        reset($attachments);
-//        while (list($localname, $remotename, $session) = each($attachments)) {
-//       if ($session == $ses) {
-///            if (!ereg ("\\/", $localname)) {
-//                $filename = $hashed_attachment_dir . '/' . $localname;
-//                unlink ($filename);
-//                unlink ("$filename.info");
-//            }
-//       }
-//        }
-//    }
-//}
-

 /* Return a nice MIME-boundary
  */
 function mimeBoundary () {
 /* Return a nice MIME-boundary
  */
 function mimeBoundary () {