Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into st...

Till Brehm

2016-04-07 98f80bef24f11594d7690162c376c3b56c449644

 interface/web/login/index.php

@@ -60,7 +60,7 @@

   //** Check variables
   if(!preg_match("/^[\w\.\-\_\@]{1,128}$/", $_POST['username'])) $error = $app->lng('user_regex_error');
   if(!preg_match("/^.{1,64}$/i", $_POST['password'])) $error = $app->lng('pw_error_length');
   if(!preg_match("/^.{1,256}$/i", $_POST['password'])) $error = $app->lng('pw_error_length');

   //** importing variables
   $ip    = ip2long($_SERVER['REMOTE_ADDR']);