Fixed safe_mode issues

thomascube

2006-09-08 70d4b9a5dc39a7165e469aa3b4f24d49e9a20b9e

 program/steps/mail/func.inc

@@ -633,10 +633,15 @@
    // show quota as image (by Brett Patterson)
    if ($attrib['display'] == 'image' && function_exists('imagegif'))
      {
      $quota_text = sprintf('<img src="%s&amp;_action=quotaimg&amp;u=%s&amp;q=%d" alt="%s" width="102" height="15" />',
      $attrib += array('width' => 100, 'height' => 14);
      $quota_text = sprintf('<img src="%s&amp;_action=quotaimg&amp;u=%s&amp;q=%d&amp;w=%d&amp;h=%d" width="%d" height="%d" alt="%s" title="%s / %s" />',
                            $COMM_PATH,
                            $quota['used'], $quota['total'],
                            $quota_text);
                            $attrib['width'], $attrib['height'],
                            $attrib['width'], $attrib['height'],
                            $quota_text,
                            show_bytes($quota["used"] * 1024),
                            show_bytes($quota["total"] * 1024));
      }
    }
  else
@@ -1240,9 +1245,9 @@
  {
  global $IMAP;

  if (!is_array($message_struct['parts']))
    return FALSE;
    
  if (empty($message_struct['parts']))
    return $message_struct['UID'] ? $IMAP->get_body($message_struct['UID']) : false;

  // check all message parts
  foreach ($message_struct['parts'] as $pid => $part)
    {
@@ -1379,42 +1384,16 @@
  }


// create temp dir for attachments
function rcmail_create_compose_tempdir()
  {
  global $CONFIG;
  
  if ($_SESSION['compose']['temp_dir'])
    return $_SESSION['compose']['temp_dir'];
  
  if (!empty($CONFIG['temp_dir']))
    $temp_dir = $CONFIG['temp_dir'].(!eregi('\/$', $CONFIG['temp_dir']) ? '/' : '').$_SESSION['compose']['id'];

  // create temp-dir for uploaded attachments
  if (!empty($CONFIG['temp_dir']) && is_writeable($CONFIG['temp_dir']))
    {
    mkdir($temp_dir);
    $_SESSION['compose']['temp_dir'] = $temp_dir;
    }

  return $_SESSION['compose']['temp_dir'];
  }


// clear message composing settings
function rcmail_compose_cleanup()
  {
  if (!isset($_SESSION['compose']))
    return;
  

  // remove attachment files from temp dir
  if (is_array($_SESSION['compose']['attachments']))
    foreach ($_SESSION['compose']['attachments'] as $attachment)
      @unlink($attachment['path']);

  // kill temp dir
  if ($_SESSION['compose']['temp_dir'])
    @rmdir($_SESSION['compose']['temp_dir']);
  
  unset($_SESSION['compose']);
  }