From 9d104cc4b031e1e9af6d7c2c19be3d8f1be12692 Mon Sep 17 00:00:00 2001
From: muxator <a.mux@inwind.it>
Date: Wed, 31 Oct 2018 23:09:27 +0100
Subject: [PATCH] ImportHandler: early return via DeMorgan's law

Inverted a boolean condition, no functional changes.
---
 src/node/handler/ImportHandler.js | 44 ++++++++++++++++---------------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/src/node/handler/ImportHandler.js b/src/node/handler/ImportHandler.js
index 28a7b2071..1526c778b 100644
--- a/src/node/handler/ImportHandler.js
+++ b/src/node/handler/ImportHandler.js
@@ -158,28 +158,30 @@ exports.doImport = function(req, res, padId)
     },
     //convert file to html
     function(callback) {
-      if(!importHandledByPlugin && !directDatabaseAccess){
-        var fileEnding = path.extname(srcFile).toLowerCase();
-        var fileIsHTML = (fileEnding === ".html" || fileEnding === ".htm");
-        var fileIsTXT = (fileEnding === ".txt");
-        if (fileIsTXT) useConvertor = false; // Don't use convertor for text files
-        // See https://github.com/ether/etherpad-lite/issues/2572
-        if (useConvertor && !fileIsHTML) {
-          convertor.convertFile(srcFile, destFile, exportExtension, function(err) {
-            //catch convert errors
-            if(err) {
-              console.warn("Converting Error:", err);
-              return callback("convertFailed");
-            } else {
-              callback();
-            }
-          });
-        } else {
-          // if no convertor only rename
-          fs.rename(srcFile, destFile, callback);
-        }
-      }else{
+      if (importHandledByPlugin || directDatabaseAccess) {
         callback();
+
+        return;
+      }
+
+      var fileEnding = path.extname(srcFile).toLowerCase();
+      var fileIsHTML = (fileEnding === ".html" || fileEnding === ".htm");
+      var fileIsTXT = (fileEnding === ".txt");
+      if (fileIsTXT) useConvertor = false; // Don't use convertor for text files
+      // See https://github.com/ether/etherpad-lite/issues/2572
+      if (useConvertor && !fileIsHTML) {
+        convertor.convertFile(srcFile, destFile, exportExtension, function(err) {
+          //catch convert errors
+          if(err) {
+            console.warn("Converting Error:", err);
+            return callback("convertFailed");
+          } else {
+            callback();
+          }
+        });
+      } else {
+        // if no convertor only rename
+        fs.rename(srcFile, destFile, callback);
       }
     },