Merge pull request #818 from Martii/controllersMisc

Additional whitespace cleanup for controllers

Auto-merge

Author: Martii

controllers/admin.js

@@ -407,6 +407,7 @@ exports.apiAdminUpdate = function (aReq, aRes, aNext) {
           delete strategyInstances[name];
           aCallback();
         });
+
         return;
       } else if (id && key) {
         if (stored[name]) {
@@ -482,12 +483,13 @@ exports.authAsUser = function (aReq, aRes, aNext) {
     options.user = user = modelParser.parseUser(aUser);
 
     if (authedUser.role >= user.role) {
-      return statusCodePage(aReq, aRes, aNext, {
+      statusCodePage(aReq, aRes, aNext, {
         statusCode: 403,
         statusMessage: authedUser.role == user.role
           ? 'Cannot auth as a user with the same rank.'
           : 'Cannot auth as a user with a higher rank.',
       });
+      return;
     }
 
     aReq.session.user = user;

controllers/auth.js

@@ -236,7 +236,8 @@ exports.callback = function (aReq, aRes, aNext) {
       addSession(aReq, aUser, function () {
         if (newstrategy && newstrategy !== strategy) {
           // Allow a user to link to another account
-          return aRes.redirect('/auth/' + newstrategy);
+          aRes.redirect('/auth/' + newstrategy);
+          return;
         } else {
           // Delete the username that was temporarily stored
           delete aReq.session.username;

controllers/discussion.js

@@ -313,7 +313,8 @@ exports.show = function (aReq, aRes, aNext) {
     var tasks = [];
 
     if (!aDiscussionData) {
-      return aNext();
+      aNext();
+      return;
     }
 
     // Session

controllers/document.js

@@ -176,15 +176,13 @@ exports.view = function (aReq, aRes, aNext) {
     });
 
     // Read git branch name of current tree
-    tasks.push(
-      function (aCallback) {
-        git.branch(function (aStr) {
-          options.git.branch = aStr;
-
-          aCallback(null);
-        });
-      }
-    );
+    tasks.push(function (aCallback) {
+      git.branch(function (aStr) {
+        options.git.branch = aStr;
+
+        aCallback(null);
+      });
+    });
   }
 
   //---

controllers/issue.js

@@ -101,7 +101,8 @@ exports.list = function (aReq, aRes, aNext) {
     var tasks = [];
 
     if (aErr || !aScript) {
-      return aNext();
+      aNext();
+      return;
     }
 
     // Session
@@ -203,7 +204,8 @@ exports.view = function (aReq, aRes, aNext) {
     var tasks = [];
 
     if (aErr || !aScript) {
-      return aNext();
+      aNext();
+      return;
     }
 
     // Session
@@ -260,7 +262,8 @@ exports.view = function (aReq, aRes, aNext) {
       var scriptOpenIssueCountQuery = null;
 
       if (aErr || !aDiscussion) {
-        return aNext();
+        aNext();
+        return;
       }
 
       // Discussion
@@ -331,7 +334,8 @@ exports.open = function (aReq, aRes, aNext) {
 
     // ---
     if (aErr || !aScript) {
-      return aNext();
+      aNext();
+      return;
     }
 
     //
@@ -364,18 +368,21 @@ exports.open = function (aReq, aRes, aNext) {
 
     if (topic && content) {
       if (!topic.trim() || !content.trim()) {
-        return statusCodePage(aReq, aRes, aNext, {
+        statusCodePage(aReq, aRes, aNext, {
           statusCode: 403,
           statusMessage: 'You cannot post an empty issue topic to this ' +
             (type === 'libs' ? 'library' : 'script')
         });
+        return;
       }
 
       // Issue Submission
       discussionLib.postTopic(authedUser, category.slug, topic, content, true,
         function (aDiscussion) {
-          if (!aDiscussion)
-            return aRes.redirect('/' + encodeURI(category) + '/open');
+          if (!aDiscussion) {
+            aRes.redirect('/' + encodeURI(category) + '/open');
+            return;
+          }
 
           aRes.redirect(encodeURI(aDiscussion.path +
             (aDiscussion.duplicateId ? '_' + aDiscussion.duplicateId : '')));
@@ -408,22 +415,25 @@ exports.comment = function (aReq, aRes, aNext) {
     var topic = aReq.params.topic;
 
     if (aErr || !aScript) {
-      return aNext();
+      aNext();
+      return;
     }
 
     if (!content || !content.trim()) {
-      return statusCodePage(aReq, aRes, aNext, {
+      statusCodePage(aReq, aRes, aNext, {
         statusCode: 403,
         statusMessage: 'You cannot post an empty comment to this issue'
       });
+      return;
     }
 
     discussionLib.findDiscussion(category, topic, function (aIssue) {
       //
       var authedUser = aReq.session.user;
 
       if (!aIssue) {
-        return aNext();
+        aNext();
+        return;
       }
 
       discussionLib.postComment(authedUser, aIssue, content, false,
@@ -449,14 +459,16 @@ exports.changeStatus = function (aReq, aRes, aNext) {
     var changed = false;
 
     if (aErr || !aScript) {
-      return aNext();
+      aNext();
+      return;
     }
 
     discussionLib.findDiscussion(category, topic, function (aIssue) {
       var authedUser = aReq.session.user;
 
       if (!aIssue) {
-        return aNext();
+        aNext();
+        return;
       }
 
       // Both the script author and the issue creator can close the issue

controllers/remove.js

@@ -32,10 +32,11 @@ exports.rm = function (aReq, aRes, aNext) {
 
   // Check to make sure multipart form data submission header is present
   if (!/multipart\/form-data/.test(aReq.headers['content-type'])) {
-    return statusCodePage(aReq, aRes, aNext, {
+    statusCodePage(aReq, aRes, aNext, {
       statusCode: 400,
       statusMessage: 'Missing required header.'
     });
+    return;
   }
 
   form = new formidable.IncomingForm();
@@ -51,19 +52,21 @@ exports.rm = function (aReq, aRes, aNext) {
     // This occurs either when no reason is supplied,
     // or a rare edge case if the view is missing the input name.
     if (!reason) {
-      return statusCodePage(aReq, aRes, aNext, {
+      statusCodePage(aReq, aRes, aNext, {
         statusCode: 403,
         statusMessage: 'Missing reason for removal.'
       });
+      return;
     }
 
     // Simple error check for string null
     reason = reason.trim();
     if (reason === '') {
-      return statusCodePage(aReq, aRes, aNext, {
+      statusCodePage(aReq, aRes, aNext, {
         statusCode: 403,
         statusMessage: 'Invalid reason for removal.'
       });
+      return;
     }
 
     switch (type) {
@@ -73,7 +76,8 @@ exports.rm = function (aReq, aRes, aNext) {
         Script.findOne({ installName: path }, function (aErr, aScript) {
           removeLib.remove(Script, aScript, authedUser, reason, function (aRemoved) {
             if (!aRemoved) {
-              return aNext();
+              aNext();
+              return;
             }
             aRes.redirect('/');
           });
@@ -84,7 +88,8 @@ exports.rm = function (aReq, aRes, aNext) {
           function (aErr, aUser) {
             removeLib.remove(User, aUser, authedUser, reason, function (aRemoved) {
               if (!aRemoved) {
-                return aNext();
+                aNext();
+                return;
               }
 
               // Destroy all the sessions belonging to the removed user

controllers/script.js

@@ -276,7 +276,8 @@ var getScriptPageTasks = function (aOptions) {
       aOptions.removeUrl = '/remove' + (script.isLib ? '/libs/' : '/scripts/') + script.installNameSlug;
 
       if (!aCanRemove) {
-        return aCallback();
+        aCallback();
+        return;
       }
 
       flagLib.getThreshold(Script, script, aAuthor, function (aThreshold) {

controllers/user.js

@@ -783,7 +783,9 @@ exports.userEditPreferencesPage = function (aReq, aRes, aNext) {
 
         // Get the strategies we have OAuth keys for
         aStrats.forEach(function (aStrat) {
-          if (aStrat.name === defaultStrategy) { return; }
+          if (aStrat.name === defaultStrategy) {
+            return;
+          }
 
           if (userStrats.indexOf(aStrat.name) > -1) {
             options.usedStrategies.push({