Merge branch 'master' into feature-search

lib/form/login.js

@@ -5,5 +5,5 @@ var form = require('express-form')
 
 module.exports = form(
   field('loginForm.email').required(),
-  field('loginForm.password').required().is(/^[\da-zA-Z@#$%-_&\+\*\?]{6,40}$/)
+  field('loginForm.password').required().is(/^[\x20-\x7F]{6,40}$/)
 );

lib/form/me/password.js

@@ -5,6 +5,7 @@ var form = require('express-form')
 
 module.exports = form(
   field('mePassword.oldPassword'),
-  field('mePassword.newPassword').required().is(/^[\da-zA-Z@#$%-_&\+\*\?]{6,40}$/),
+  field('mePassword.newPassword').required().is(/^[\x20-\x7F]{6,40}$/),
   field('mePassword.newPasswordConfirm').required()
 );
+  //[}m943&T^x7.2kB%98;9CD2Kx[kr{/v!4

lib/form/register.js

@@ -7,7 +7,7 @@ module.exports = form(
   field('registerForm.username').required().is(/^[\da-zA-Z\-_\.]+$/),
   field('registerForm.name').required(),
   field('registerForm.email').required(),
-  field('registerForm.password').required().is(/^[\da-zA-Z@#$%-_&\+\*\?]{6,64}$/),
+  field('registerForm.password').required().is(/^[\x20-\x7F]{6,40}$/),
   field('registerForm.fbId').isInt(),
   field('registerForm.googleId').isInt()
 );

lib/util/middlewares.js

@@ -161,7 +161,8 @@ exports.applicationNotInstalled = function() {
     var config = req.config;
 
     if (Object.keys(config.crowi).length !== 1) {
-      return res.render('500', { error: 'Application already installed.' });
+      req.flash('errorMessage', 'Application already installed.');
+      return res.redirect('admin'); // admin以外はadminRequiredで'/'にリダイレクトされる
     }
 
     return next();

lib/views/admin/index.html

@@ -12,6 +12,14 @@
 
 {% block content_main %}
 <div class="content-main">
+  
+  {% set emessage = req.flash('errorMessage') %}
+  {% if emessage.length %}
+  <div class="alert alert-danger">
+    {{ emessage }}
+  </div>
+  {% endif %}
+
   <div class="row">
     <div class="col-md-3">
       <ul class="nav nav-pills nav-stacked">