Просмотр исходного кода

Merge pull request #1 from syenze/feature/fixed_jshint

:+1: 
modifyed typo
Syenze 11 лет назад
Родитель
Сommit
73105641f9
4 измененных файлов с 9 добавлено и 17 удалено
  1. 3 7
      lib/mailer.js
  2. 4 9
      lib/middlewares.js
  3. 1 0
      models/bookmark.js
  4. 1 1
      routes/admin.js

+ 3 - 7
lib/mailer.js

@@ -52,7 +52,7 @@ module.exports = function(app) {
     }
 
     var ses = require('nodemailer-ses-transport');
-    var client = nodemailer.createTransport(ses(option));
+    client = nodemailer.createTransport(ses(option));
 
     debug('mailer setted up for SES', client);
     return client;
@@ -64,16 +64,12 @@ module.exports = function(app) {
       return;
     }
 
-    if (config.crowi['mail:smtpUser']
-        && config.crowi['mail:smtpPassword']
-        && config.crowi['mail:smtpHost']
-        && config.crowi['mail:smtpPort']
+    if (config.crowi['mail:smtpUser'] && config.crowi['mail:smtpPassword'] && config.crowi['mail:smtpHost'] && config.crowi['mail:smtpPort']
       ) {
       // SMTP 設定がある場合はそれを優先
       mailer = createSMTPClient();
 
-    } else if (config.crowi['aws:accessKeyId']
-      && config.crowi['aws:secretAccessKey']) {
+    } else if (config.crowi['aws:accessKeyId'] && config.crowi['aws:secretAccessKey']) {
       // AWS 設定がある場合はSESを設定
       mailer = createSESClient();
     } else {

+ 4 - 9
lib/middlewares.js

@@ -1,5 +1,4 @@
-var debug = require('debug')('crowi:lib:middlewares')
-  ;
+var debug = require('debug')('crowi:lib:middlewares');
 
 exports.loginChecker = function(app, models) {
   return function(req, res, next) {
@@ -7,7 +6,7 @@ exports.loginChecker = function(app, models) {
     if (req.session.user && '_id' in req.session.user) {
       models.User.findById(req.session.user._id, function(err, userData) {
         if (err) {
-          next()
+          next();
         } else {
           req.user = req.session.user = userData;
           res.locals({user: req.user});
@@ -38,7 +37,7 @@ exports.swigFilters = function(app, swig) {
 
     swig.setFilter('datetz', function(input, format) {
       // timezone
-      var swigFilters = require('swig/lib/filters')
+      var swigFilters = require('swig/lib/filters');
       return swigFilters.date(input, format, app.get('tzoffset'));
     });
 
@@ -130,11 +129,7 @@ exports.applicationInstalled = function() {
 exports.awsEnabled = function() {
   return function (req, res, next) {
     var config = req.config;
-    if (config.crowi['aws:region'] != ''
-        && config.crowi['aws:bucket'] != ''
-        && config.crowi['aws:accessKeyId'] != ''
-        && config.crowi['aws:secretAccessKey'] != ''
-       ) {
+    if (config.crowi['aws:region'] !== '' && config.crowi['aws:bucket'] !== '' && config.crowi['aws:accessKeyId'] !== '' && config.crowi['aws:secretAccessKey'] !== '') {
       req.flash('globalError', 'AWS settings required to use this function. Please ask the administrator.');
       return res.redirect('/');
     }

+ 1 - 0
models/bookmark.js

@@ -4,6 +4,7 @@ module.exports = function(app, models) {
     , ObjectId = mongoose.Schema.Types.ObjectId
     , bookmarkSchema;
 
+
   bookmarkSchema = new mongoose.Schema({
     page: { type: ObjectId, ref: 'Page', index: true },
     user: { type: ObjectId, ref: 'User', index: true },

+ 1 - 1
routes/admin.js

@@ -221,7 +221,7 @@ module.exports = function(app) {
   function saveSetting(req, res, form)
   {
     Config.updateNamespaceByArray('crowi', form, function(err, config) {
-      Config.updateConfigCache('crowi', config)
+      Config.updateConfigCache('crowi', config);
       return res.json({status: true});
     });
   }