fix(Register): Add captcha checker

1. Rename some site_config key name 2. Add Captcha Check in UserRegisterForm
Rhilip · Jun 4, 2019 · bacee6d · bacee6d
1 parent 21dca47
commit bacee6d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 23 deletions.
diff --git a/apps/models/form/UserRegisterForm.php b/apps/models/form/UserRegisterForm.php
@@ -14,9 +14,12 @@
 
 use Rid\Helpers\StringHelper;
 use Rid\Validators\Validator;
+use Rid\Validators\CaptchaTrait;
 
 class UserRegisterForm extends Validator
 {
+    use CaptchaTrait;
+
     public $id;
 
     public $username;
@@ -91,7 +94,12 @@ public static function inputRules()
 
     public static function callbackRules()
     {
-        return ['isRegisterSystemOpen', 'isMaxUserReached', 'isMaxRegisterIpReached', 'isValidUsername', 'isValidEmail', 'checkRegisterType'];
+        return [
+            'validateCaptcha',
+            'isRegisterSystemOpen', 'isMaxUserReached', 'isMaxRegisterIpReached',
+            'isValidUsername', 'isValidEmail',
+            'checkRegisterType'
+        ];
     }
 
     protected function isRegisterSystemOpen()
@@ -109,14 +117,14 @@ protected function isRegisterSystemOpen()
 
     protected function isMaxUserReached()
     {
-        if (app()->config->get('register.max_user_check') &&
+        if (app()->config->get('register.check_max_user') &&
             Site::fetchUserCount() >= app()->config->get('base.max_user'))
             $this->buildCallbackFailMsg('MaxUserReached','Max user limit Reached');
     }
 
     public function isMaxRegisterIpReached()
     {
-        if (app()->config->get("register.max_ip_check")) {
+        if (app()->config->get("register.check_max_ip")) {
             $client_ip = app()->request->getClientIp();
 
             $max_user_per_ip = app()->config->get("register.per_ip_user") ?: 5;
@@ -152,15 +160,15 @@ public function isValidEmail()
     {
         $email = $this->email;
         $email_suffix = substr($email, strpos($email, '@'));  // Will get `@test.com` as example
-        if (app()->config->get("register.enabled_email_black_list") &&
+        if (app()->config->get("register.check_email_blacklist") &&
             app()->config->get("register.email_black_list")) {
             $email_black_list = explode(",", app()->config->get("register.email_black_list"));
             if (in_array($email_suffix, $email_black_list)) {
                 $this->buildCallbackFailMsg('ValidEmail', "The email suffix `$email_suffix` is not allowed.");
                 return;
             }
         }
-        if (app()->config->get("register.enabled_email_white_list") &&
+        if (app()->config->get("register.check_email_whitelist") &&
             app()->config->get("register.email_white_list")) {
             $email_white_list = explode(",", app()->config->get("register.email_white_list"));
             if (!in_array($email_suffix, $email_white_list)) {

diff --git a/migration/ridpt.sql b/migration/ridpt.sql
@@ -3,9 +3,9 @@
 -- https://www.phpmyadmin.net/
 --
 -- Host: 127.0.0.1
--- Generation Time: May 31, 2019 at 09:48 PM
+-- Generation Time: Jun 04, 2019 at 03:00 PM
 -- Server version: 8.0.16
--- PHP Version: 7.3.5
+-- PHP Version: 7.3.6
 
 SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO";
 SET AUTOCOMMIT = 0;
@@ -384,6 +384,7 @@ INSERT INTO `site_config` (`name`, `value`) VALUES
 ('base.enable_extend_debug', '1'),
 ('base.enable_register_system', '1'),
 ('base.enable_tracker_system', '1'),
+('base.max_news_sum', '5'),
 ('base.max_per_user_session', '10'),
 ('base.max_user', '5000'),
 ('base.site_author', 'Rhilip'),
@@ -412,12 +413,12 @@ INSERT INTO `site_config` (`name`, `value`) VALUES
 ('register.by_green', '0'),
 ('register.by_invite', '1'),
 ('register.by_open', '1'),
+('register.check_email_blacklist', '1'),
+('register.check_email_whitelist', '1'),
+('register.check_max_ip', '1'),
+('register.check_max_user', '1'),
 ('register.email_black_list', '@test.com'),
 ('register.email_white_list', '@gmail.com'),
-('register.enabled_email_black_list', '1'),
-('register.enabled_email_white_list', '1'),
-('register.max_ip_check', '1'),
-('register.max_user_check', '1'),
 ('register.per_ip_user', '5'),
 ('register.user_confirm_way', 'auto'),
 ('register.user_default_bonus', '0'),
@@ -618,18 +619,6 @@ CREATE TABLE IF NOT EXISTS `torrents_categories` (
 -- RELATIONSHIPS FOR TABLE `torrents_categories`:
 --
 
---
--- Truncate table before insert `torrents_categories`
---
-
-TRUNCATE TABLE `torrents_categories`;
---
--- Dumping data for table `torrents_categories`
---
-
-INSERT INTO `torrents_categories` (`id`, `name`) VALUES
-(1, 'Movie');
-
 -- --------------------------------------------------------
 
 --