mirror of
https://github.com/torrentpier/torrentpier
synced 2025-08-14 18:48:21 -07:00
Refactored Validate class (#646)
* Refactored Validate class * Fixed undefined variables * Moved check for empty
This commit is contained in:
parent
274550cec4
commit
8cbe09027a
6 changed files with 35 additions and 26 deletions
|
@ -26,7 +26,7 @@ $value = $this->request['value'] = (string)(isset($this->request['value'])) ? $t
|
|||
switch ($field) {
|
||||
case 'username':
|
||||
$value = clean_username($value);
|
||||
if ($err = \TorrentPier\Legacy\Validate::username($value)) {
|
||||
if ($err = \TorrentPier\Validate::username($value)) {
|
||||
$this->ajax_die(strip_tags($err));
|
||||
}
|
||||
$this->response['new_value'] = $this->request['value'];
|
||||
|
@ -34,7 +34,7 @@ switch ($field) {
|
|||
|
||||
case 'user_email':
|
||||
$value = htmlCHR($value);
|
||||
if ($err = \TorrentPier\Legacy\Validate::email($value)) {
|
||||
if ($err = \TorrentPier\Validate::email($value)) {
|
||||
$this->ajax_die($err);
|
||||
}
|
||||
$this->response['new_value'] = $this->request['value'];
|
||||
|
|
|
@ -20,9 +20,7 @@ switch ($mode) {
|
|||
case 'check_name':
|
||||
$username = clean_username($this->request['username']);
|
||||
|
||||
if (empty($username)) {
|
||||
$html = '<img src="./styles/images/bad.gif"> <span class="leechmed bold">' . $lang['CHOOSE_A_NAME'] . '</span>';
|
||||
} elseif ($err = \TorrentPier\Legacy\Validate::username($username)) {
|
||||
if ($err = \TorrentPier\Validate::username($username)) {
|
||||
$html = '<img src="./styles/images/bad.gif"> <span class="leechmed bold">' . $err . '</span>';
|
||||
}
|
||||
break;
|
||||
|
@ -30,9 +28,7 @@ switch ($mode) {
|
|||
case 'check_email':
|
||||
$email = (string)$this->request['email'];
|
||||
|
||||
if (empty($email)) {
|
||||
$html = '<img src="./styles/images/bad.gif"> <span class="leechmed bold">' . $lang['CHOOSE_E_MAIL'] . '</span>';
|
||||
} elseif ($err = \TorrentPier\Legacy\Validate::email($email)) {
|
||||
if ($err = \TorrentPier\Validate::email($email)) {
|
||||
$html = '<img src="./styles/images/bad.gif"> <span class="leechmed bold">' . $err . '</span>';
|
||||
}
|
||||
break;
|
||||
|
@ -41,7 +37,7 @@ switch ($mode) {
|
|||
$pass = (string)$this->request['pass'];
|
||||
$pass_confirm = (string)$this->request['pass_confirm'];
|
||||
|
||||
if ($err = \TorrentPier\Legacy\Validate::password($pass, $pass_confirm)) {
|
||||
if ($err = \TorrentPier\Validate::password($pass, $pass_confirm)) {
|
||||
$html = '<img src="./styles/images/bad.gif"> <span class="leechmed bold">' . $err . '</span>';
|
||||
} else {
|
||||
$text = (IS_GUEST) ? $lang['CHOOSE_PASS_REG_OK'] : $lang['CHOOSE_PASS_OK'];
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue