Merge branch 'develop' of projects.ceondo.com:indefero into develop

This commit is contained in:
Thomas Keller 2010-09-14 22:34:57 +00:00
commit 7d5ba6248e

View File

@ -204,7 +204,7 @@ class IDF_Form_UserAccount extends Pluf_Form
return ''; return '';
} }
if (preg_match('#^ssh\-[a-z]{3}\s\S+\s\S+$#', $key)) { if (preg_match('#^ssh\-[a-z]{3}\s\S+==(\s\S+)?$#', $key)) {
$key = str_replace(array("\n", "\r"), '', $key); $key = str_replace(array("\n", "\r"), '', $key);
if (Pluf::f('idf_strong_key_check', false)) { if (Pluf::f('idf_strong_key_check', false)) {