From 761bd07f4b5c99fee2808b4a0b4ad7f4c75d4efd Mon Sep 17 00:00:00 2001
From: bradymiller <bradymiller@users.sourceforge.net>
Date: Mon, 18 Feb 2013 01:07:34 -0800
Subject: [PATCH] Couple minor fixes to previous Direct Messages Receiving
 commit.

---
 interface/reports/direct_message_log.php | 4 +++-
 library/classes/Installer.class.php      | 6 ++++--
 library/direct_message_check.inc         | 6 ++----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/interface/reports/direct_message_log.php b/interface/reports/direct_message_log.php
index c4df0f13e..8e8fba914 100644
--- a/interface/reports/direct_message_log.php
+++ b/interface/reports/direct_message_log.php
@@ -157,8 +157,10 @@ require_once("../globals.php");
 
       <?php if ($row['status'] == "Q") { ?>
           <td align='center'><?php echo xlt("Queued") ?></td>
+      <?php } else if ($row['status'] == "S") { ?>
+          <td align='center'><?php echo xlt("Sent, but delivery not yet confirmed.") ?></td>
       <?php } else if ($row['status'] == "D") { ?>
-          <td align='center'><?php echo xlt("Dispatched") ?></td>
+          <td align='center'><?php echo xlt("Delivery Confirmed") ?></td>
       <?php } else if ($row['status'] == "R") { ?>
           <td align='center'><?php echo xlt("Received") ?></td>
       <?php } else if ($row['status'] == "F") { ?>
diff --git a/library/classes/Installer.class.php b/library/classes/Installer.class.php
index cbb0716cb..74cc57d3a 100644
--- a/library/classes/Installer.class.php
+++ b/library/classes/Installer.class.php
@@ -159,8 +159,10 @@ class Installer
   public function load_dumpfiles() {
     $sql_results = ''; // information string which is returned
     foreach ($this->dumpfiles as $filename => $title) {
-        $sql_results .= $this->load_file($filename,$title);
-        if ($sql_results == FALSE) return FALSE;
+        $sql_results_temp = '';
+        $sql_results_temp = $this->load_file($filename,$title);
+        if ($sql_results_temp == FALSE) return FALSE;
+        $sql_results .= $sql_results_temp;
     }
     return $sql_results;
   }
diff --git a/library/direct_message_check.inc b/library/direct_message_check.inc
index 4f5e3a2b3..c2a93cca9 100644
--- a/library/direct_message_check.inc
+++ b/library/direct_message_check.inc
@@ -306,11 +306,9 @@ function phimail_logit($success,$text,$pid=0,$event="direct-message-check") {
  */
 function phimail_read_blob($fp,$len) {
 
-   $fpath=dirname(__FILE__) . "/../sites/default/documents/tmp_direct";
+   $fpath=$GLOBALS['temporary_files_dir'];
    if(!@file_exists($fpath)) {
-      if(!@mkdir($fpath,0700)) {
-         return FALSE;
-      }
+     return FALSE;
    }
    $name = uniqid("direct-");
    $fn = $fpath . "/" . $name . ".dat";
-- 
2.11.4.GIT