diff --git a/application/frontend/components/auth/auth.login.tpl b/application/frontend/components/auth/auth.login.tpl index c4f75e1f..a24b0f66 100644 --- a/application/frontend/components/auth/auth.login.tpl +++ b/application/frontend/components/auth/auth.login.tpl @@ -8,20 +8,20 @@ {hook run='login_begin'} -
+ {hook run='form_login_begin'} {* Логин *} {component 'field' template='text' name = 'login' - rules = [ 'required' => true, 'rangelength' => '[2,20]' ] + rules = [ 'required' => true, 'length' => '[2,20]' ] label = $aLang.auth.login.form.fields.login.label} {* Пароль *} {component 'field' template='text' name = 'password' type = 'password' - rules = [ 'required' => true, 'rangelength' => '[2,20]' ] + rules = [ 'required' => true, 'length' => '[2,20]' ] label = $aLang.auth.labels.password} {* Каптча *} diff --git a/application/frontend/components/auth/auth.registration.tpl b/application/frontend/components/auth/auth.registration.tpl index 25f93ed5..6a3bd7bb 100644 --- a/application/frontend/components/auth/auth.registration.tpl +++ b/application/frontend/components/auth/auth.registration.tpl @@ -14,17 +14,17 @@ {* Логин *} {component 'field' template='text' name = 'login' - rules = [ 'required' => true, 'rangelength' => '[2,20]', 'remote' => "{router page='auth'}ajax-validate-fields", 'remote-method' => 'POST' ] + rules = [ 'required' => true, 'length' => '[2,20]', 'remote' => "{router page='auth'}ajax-validate-fields" ] label = $aLang.auth.labels.login} {* E-mail *} - {component 'field' template='email' rules=[ 'remote' => "{router page='auth'}ajax-validate-fields", 'remote-method' => 'POST' ]} + {component 'field' template='email' rules=[ 'remote' => "{router page='auth'}ajax-validate-fields" ]} {* Пароль *} {component 'field' template='text' name = 'password' type = 'password' - rules = [ 'required' => true, 'rangelength' => '[5,20]' ] + rules = [ 'required' => true, 'length' => '[5,20]' ] label = $aLang.auth.labels.password inputClasses = 'js-input-password-reg'} @@ -32,7 +32,7 @@ {component 'field' template='text' name = 'password_confirm' type = 'password' - rules = [ 'required' => true, 'rangelength' => '[5,20]', 'equalto' => '.js-input-password-reg' ] + rules = [ 'required' => true, 'length' => '[5,20]', 'equalto' => '.js-input-password-reg' ] label = $aLang.auth.registration.form.fields.password_confirm.label} {* Каптча *} diff --git a/application/frontend/components/blog/add.tpl b/application/frontend/components/blog/add.tpl index 4b273985..19910fc3 100644 --- a/application/frontend/components/blog/add.tpl +++ b/application/frontend/components/blog/add.tpl @@ -12,7 +12,7 @@ {* Название блога *} {component 'field' template='text' name = 'blog_title' - rules = [ 'required' => true, 'rangelength' => "[2,200]" ] + rules = [ 'required' => true, 'length' => "[2,200]" ] note = $aLang.blog.add.fields.title.note label = $aLang.blog.add.fields.title.label} @@ -48,7 +48,7 @@ set = 'light' mediaTargetType = 'blog' name = 'blog_description' - rules = [ 'required' => true, 'rangelength' => '[10,3000]' ] + rules = [ 'required' => true, 'length' => '[10,3000]' ] inputClasses = 'js-editor-default' label = $aLang.blog.add.fields.description.label} diff --git a/application/frontend/components/talk/add.tpl b/application/frontend/components/talk/add.tpl index 09d31e71..71b3da30 100644 --- a/application/frontend/components/talk/add.tpl +++ b/application/frontend/components/talk/add.tpl @@ -20,7 +20,7 @@ {* Заголовок *} {component 'field' template='text' name = 'talk_title' - rules = [ 'required' => true, 'rangelength' => '[2,200]' ] + rules = [ 'required' => true, 'length' => '[2,200]' ] label = $aLang.talk.add.fields.title.label} {* Текст сообщения *} @@ -28,7 +28,7 @@ sSet = 'light' sMediaTargetType = 'talk' name = 'talk_text' - rules = [ 'required' => true, 'rangelength' => '[2,3000]' ] + rules = [ 'required' => true, 'length' => '[2,3000]' ] label = $aLang.talk.add.fields.text.label inputClasses = 'js-editor-default'} diff --git a/application/frontend/components/user/modals/modal.add-friend.tpl b/application/frontend/components/user/modals/modal.add-friend.tpl index d6c94872..a588dd8b 100644 --- a/application/frontend/components/user/modals/modal.add-friend.tpl +++ b/application/frontend/components/user/modals/modal.add-friend.tpl @@ -7,7 +7,7 @@ {component 'field' template='textarea' name = 'add_friend_text' - rules = [ 'required' => true, 'rangelength' => '[2,200]' ] + rules = [ 'required' => true, 'length' => '[2,200]' ] rows = 3 noMargin = true label = {lang name='user.friends.form.fields.text.label'}} diff --git a/application/frontend/components/user/settings/account.tpl b/application/frontend/components/user/settings/account.tpl index 50f0dd4e..1f1b059e 100644 --- a/application/frontend/components/user/settings/account.tpl +++ b/application/frontend/components/user/settings/account.tpl @@ -34,7 +34,7 @@ {* Новый пароль *} {component 'field' template='text' name = 'password' - rules = [ 'rangelength' => '[5,20]' ] + rules = [ 'length' => '[5,20]' ] type = 'password' inputClasses = 'width-200 js-user-settings-password' label = {lang name='user.settings.account.fields.password_new.label'}} @@ -42,7 +42,7 @@ {* Повторить новый пароль *} {component 'field' template='text' name = 'password_confirm' - rules = [ 'rangelength' => '[5,20]', 'equalto' => '.js-user-settings-password' ] + rules = [ 'length' => '[5,20]', 'equalto' => '.js-user-settings-password' ] type = 'password' inputClasses = 'width-200' label = {lang name='user.settings.account.fields.password_confirm.label'}} diff --git a/application/frontend/components/user/settings/profile.tpl b/application/frontend/components/user/settings/profile.tpl index fe1fb715..0a2639bb 100644 --- a/application/frontend/components/user/settings/profile.tpl +++ b/application/frontend/components/user/settings/profile.tpl @@ -38,7 +38,7 @@ {* Имя *} {component 'field' template='text' name = 'profile_name' - rules = [ 'rangelength' => "[2,{Config::Get('module.user.name_max')}]" ] + rules = [ 'length' => "[2,{Config::Get('module.user.name_max')}]" ] value = $user->getProfileName()|escape label = {lang name='user.settings.profile.fields.name.label'}} @@ -78,7 +78,7 @@ {* О себе *} {component 'field' template='textarea' name = 'profile_about' - rules = [ 'rangelength' => '[1,3000]' ] + rules = [ 'length' => '[1,3000]' ] rows = 5 value = $user->getProfileAbout()|escape label = {lang name='user.settings.profile.fields.about.label'}} diff --git a/framework b/framework index b9dd6e7a..1dcefd6f 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit b9dd6e7ad24b6fcc376d2702ca7c3cf162442f36 +Subproject commit 1dcefd6f23666d2e3a27fd2c83c175a86b22b659