From b5864adf0637a6de794b237c297f6dfbf6cfcfe6 Mon Sep 17 00:00:00 2001
From: Vlad <vlad@mailpoet.com>
Date: Wed, 17 Feb 2016 11:47:20 -0500
Subject: [PATCH] - Fixes writable path check

---
 lib/Subscribers/ImportExport/Export/Export.php | 18 ++++++++++--------
 .../ImportExport/Export/ExportCest.php         |  2 +-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/lib/Subscribers/ImportExport/Export/Export.php b/lib/Subscribers/ImportExport/Export/Export.php
index 2a295838b0..ef6978a9f5 100644
--- a/lib/Subscribers/ImportExport/Export/Export.php
+++ b/lib/Subscribers/ImportExport/Export/Export.php
@@ -17,6 +17,7 @@ class Export {
   public $segments;
   public $subscribers_without_segment;
   public $subscriber_fields;
+  public $export_path;
   public $export_file;
   public $export_file_URL;
   public $profiler_start;
@@ -28,22 +29,23 @@ class Export {
     $this->segments = $data['segments'];
     $this->subscribers_without_segment = array_search(0, $this->segments);
     $this->subscriber_fields = $data['subscriber_fields'];
+    $this->export_path = Env::$temp_path;
     $this->export_file = $this->getExportFile($this->export_format_option);
     $this->export_file_URL = $this->getExportFileURL($this->export_file);
     $this->profiler_start = microtime(true);
   }
 
   function process() {
-    $subscribers = $this->getSubscribers();
-    $subscriber_custom_fields = $this->getSubscriberCustomFields();
-    $formatted_subscriber_fields = $this->formatSubscriberFields(
-      $this->subscriber_fields,
-      $subscriber_custom_fields
-    );
     try {
-      if(is_writable($this->export_file)) {
+      if(is_writable($this->export_path) === false) {
         throw new \Exception(__("Couldn't save export file on the server."));
       }
+      $subscribers = $this->getSubscribers();
+      $subscriber_custom_fields = $this->getSubscriberCustomFields();
+      $formatted_subscriber_fields = $this->formatSubscriberFields(
+        $this->subscriber_fields,
+        $subscriber_custom_fields
+      );
       if($this->export_format_option === 'csv') {
         $CSV_file = fopen($this->export_file, 'w');
         $format_CSV = function($row) {
@@ -181,7 +183,7 @@ class Export {
 
   function getExportFile($format) {
     return sprintf(
-      Env::$temp_path . '/MailPoet_export_%s.%s',
+      $this->export_path . '/MailPoet_export_%s.%s',
       substr(md5(time()), 0, 4),
       $format
     );
diff --git a/tests/unit/Subscribers/ImportExport/Export/ExportCest.php b/tests/unit/Subscribers/ImportExport/Export/ExportCest.php
index cc0ea01427..eba0978fb9 100644
--- a/tests/unit/Subscribers/ImportExport/Export/ExportCest.php
+++ b/tests/unit/Subscribers/ImportExport/Export/ExportCest.php
@@ -212,7 +212,7 @@ class ExportCest {
   }
 
   function itRequiresWritableExportFile() {
-    $this->export->export_file = '/dev/random';
+    $this->export->export_path = '/fake_folder';
     $result = $this->export->process();
     expect($result['errors'][0])
       ->equals("Couldn't save export file on the server.");