Skip to content
Snippets Groups Projects
Commit c6a20abe authored by Роман Штейнберг's avatar Роман Штейнберг
Browse files

FIX: regex in js

parent 0c4bb848
No related merge requests found
......@@ -9,10 +9,6 @@ function onSettingsPopup() {
$loginTextBox.keyup(function (event) {
if (event.keyCode == 13)
$changeLoginBut.trigger('click');
else {
var prev = $loginTextBox.val();
$loginTextBox.val(prev.replace(/[^a-zа-яё0-9./<>?,;:"'`!@#$%^&*()\[\]{}_+=|\\\-~]/gi, ''));
}
});
$changeLoginBut.click(function () {
......@@ -21,7 +17,7 @@ function onSettingsPopup() {
if (!login.length)
return $loginTextBox.focus();
if (!/^[^a-zа-яё0-9./<>?,;:"'`!@#$%^&*()\[\]{}_+=|\\\-~]+$/i.test(login)) {
if (!login.match(/^[a-zA-Z0-9_\-\.]{2,}$/)) {
EventInspector.error('Некорректные символы в логине, попробуйте ещё раз!');
$loginTextBox.focus();
return;
......
......@@ -10,7 +10,7 @@ class Controller_Handler_Settings extends Controller_Handler
}
public function action_changeLogin() {
if ($_POST['login'] !== $this->user->Login) {
if ($this->post['login'] !== $this->user->Login) {
try {
Model_Account::changeLogin($this->user->ID, $this->post['login'])
? $this->user->Login = $this->post['login']
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment