From b34c1f5c6cc53c41b20298ac04d4c16e571fb12f Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Wed, 26 Aug 2015 14:54:54 +0800
Subject: [PATCH]  * finish task #2320.

---
 module/bug/control.php     | 2 +-
 module/file/model.php      | 4 ++--
 module/project/control.php | 2 +-
 module/story/control.php   | 2 +-
 module/task/control.php    | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/module/bug/control.php b/module/bug/control.php
index 8e2dffced8..cdb0d913c5 100644
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -1104,7 +1104,7 @@ class bug extends control
         $mailContent = $this->parse($this->moduleName, 'sendmail');
 
         /* Send it. */
-        $this->loadModel('mail')->send($toList, $productName . ':' . 'BUG #'. $bug->id . $this->lang->colon . $bug->title, $mailContent, $ccList);
+        $this->loadModel('mail')->send($toList, 'BUG #'. $bug->id . $this->lang->colon . $bug->title . ' - ' . $productName, $mailContent, $ccList);
         if($this->mail->isError()) trigger_error(join("\n", $this->mail->getError()));
     }
 
diff --git a/module/file/model.php b/module/file/model.php
index ff8bb1b376..5956bb2460 100644
--- a/module/file/model.php
+++ b/module/file/model.php
@@ -284,7 +284,7 @@ class fileModel extends model
      */
     public function parseCSV($fileName)
     {
-        $handle = fopen($this->session->importFile, 'r');
+        $handle = fopen($fileName, 'r');
         $col    = -1;
         $row    = 0;
         $data   = array();
@@ -369,7 +369,7 @@ class fileModel extends model
             $row ++;
             $col = -1;
         }
-        fclose ($handle);
+        fclose($handle);
 
         return $data;
     }
diff --git a/module/project/control.php b/module/project/control.php
index deb3ec35bc..1809c1a5ef 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -1267,7 +1267,7 @@ class project extends control
         $mailContent = $this->parse($this->moduleName, 'sendmail');
 
         /* Send emails. */
-        $this->loadModel('mail')->send($toList, $projectName . ':' . 'TASK#' . $task->id . $this->lang->colon . $task->name, $mailContent, $ccList);
+        $this->loadModel('mail')->send($toList, 'TASK#' . $task->id . $this->lang->colon . $task->name . ' - ' . $projectName, $mailContent, $ccList);
         if($this->mail->isError()) trigger_error(join("\n", $this->mail->getError()));
     }
 
diff --git a/module/story/control.php b/module/story/control.php
index e981583dca..cc871a1d65 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -1074,7 +1074,7 @@ class story extends control
         $mailContent = $this->parse($this->moduleName, 'sendmail');
 
         /* Send it. */
-        $this->loadModel('mail')->send($toList, $productName . ':' . 'STORY #' . $story->id . $this->lang->colon . $story->title, $mailContent, $ccList);
+        $this->loadModel('mail')->send($toList, 'STORY #' . $story->id . $this->lang->colon . $story->title . ' - ' . $productName, $mailContent, $ccList);
         if($this->mail->isError()) trigger_error(join("\n", $this->mail->getError()));
     }
     /**
diff --git a/module/task/control.php b/module/task/control.php
index 705a15d7f8..6fc9247fb9 100644
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -930,7 +930,7 @@ class task extends control
         $mailContent = $this->parse($this->moduleName, 'sendmail');
 
         /* Send emails. */
-        $this->loadModel('mail')->send($toList, $projectName . ':' . 'TASK#' . $task->id . $this->lang->colon . $task->name, $mailContent, $ccList);
+        $this->loadModel('mail')->send($toList, 'TASK#' . $task->id . $this->lang->colon . $task->name . ' - ' . $projectName, $mailContent, $ccList);
         if($this->mail->isError()) trigger_error(join("\n", $this->mail->getError()));
     }