From e536f4c4bde929fdb56372a8cfd0eb8f30902f05 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Tue, 31 Oct 2017 17:45:23 +0800
Subject: [PATCH] fix(backup): download file link url issues

---
 config/env/torrents.js                                     | 1 -
 .../backup/client/controllers/backup.client.controller.js  | 3 +++
 modules/backup/client/views/backup.client.view.html        | 3 ++-
 .../forums/server/controllers/forums.server.controller.js  | 7 +++++--
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/config/env/torrents.js b/config/env/torrents.js
index bb3b63d8..76f6f6f8 100644
--- a/config/env/torrents.js
+++ b/config/env/torrents.js
@@ -31,7 +31,6 @@ module.exports = {
     backup: {
       enable: true,
       dir: './modules/backup/client/backup/'
-
     },
 
     /**
diff --git a/modules/backup/client/controllers/backup.client.controller.js b/modules/backup/client/controllers/backup.client.controller.js
index b36e82ad..7464e2d0 100644
--- a/modules/backup/client/controllers/backup.client.controller.js
+++ b/modules/backup/client/controllers/backup.client.controller.js
@@ -14,6 +14,7 @@
     vm.user = Authentication.user;
     vm.DLS = DownloadService;
     vm.itemsPerPageConfig = MeanTorrentConfig.meanTorrentConfig.itemsPerPage;
+    vm.backupConfig = MeanTorrentConfig.meanTorrentConfig.backup;
 
     vm.deleteList = [];
 
@@ -67,6 +68,8 @@
         mtDebug.info(items);
         vm.buildPager();
       });
+
+      mtDebug.info(vm.backupConfig.dir);
     };
 
     /**
diff --git a/modules/backup/client/views/backup.client.view.html b/modules/backup/client/views/backup.client.view.html
index 7e020085..d7e9b92e 100644
--- a/modules/backup/client/views/backup.client.view.html
+++ b/modules/backup/client/views/backup.client.view.html
@@ -30,7 +30,8 @@
                         <tbody>
                             <tr class="message-item" ng-repeat="f in vm.pagedItems">
                                 <td class="td-v-middle">
-                                    <a href="/backup/download/{{f.name}}"
+                                    <a href="{{vm.backupConfig.dir.substr(1)}}{{f.name}}"
+                                       target="_self"
                                        ng-click="vm.DLS.downloadBackupFile(f.name); $event.preventDefault(); $event.stopPropagation();">{{f.name}}</a>
                                 </td>
                                 <td class="td-v-middle text-center">
diff --git a/modules/forums/server/controllers/forums.server.controller.js b/modules/forums/server/controllers/forums.server.controller.js
index c35b593f..3db9fed3 100644
--- a/modules/forums/server/controllers/forums.server.controller.js
+++ b/modules/forums/server/controllers/forums.server.controller.js
@@ -330,8 +330,11 @@ exports.postNewTopic = function (req, res) {
   });
 
   //replace content path
-  var regex = new RegExp('/modules/forums/client/attach/temp/', 'g');
-  topic.content = topic.content.replace(regex, '/modules/forums/client/attach/');
+  var tmp = config.uploads.attach.file.temp.substr(1);
+  var dst = config.uploads.attach.file.dest.substr(1);
+
+  var regex = new RegExp(tmp, 'g');
+  topic.content = topic.content.replace(regex, dst);
 
   //save topic
   topic.save(function (err) {