Применена новая версия пакета batumibiz/captcha

johncms · Nov 7, 2019 · 6f9091f · 6f9091f
1 parent f2d59be
commit 6f9091f
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 22 deletions.
diff --git a/composer.json b/composer.json
@@ -33,7 +33,7 @@
     "ext-mbstring": "*",
     "ext-pdo": "*",
     "aura/autoload": "^2.0",
-    "batumibiz/captcha": "^2.0.1",
+    "batumibiz/captcha": "^3.0",
     "league/plates": "^3.3",
     "nikic/fast-route": "^1.3",
     "verot/class.upload.php": "^2.0",

diff --git a/composer.lock b/composer.lock
diff --git a/modules/login/index.php b/modules/login/index.php
@@ -10,7 +10,6 @@
  * @link      https://johncms.com JohnCMS Project
  */
 
-use Batumibiz\Captcha\Captcha;
 use Johncms\Api\ConfigInterface;
 use Johncms\Api\ToolsInterface;
 use Johncms\Api\UserInterface;
@@ -101,12 +100,11 @@
                 } else {
                     // Показываем CAPTCHA
                     $display_form = 0;
-                    $cap = new Captcha;
-                    $code = $cap->generateCode();
+                    $code = (string) new Batumibiz\Captcha\Code;
                     $_SESSION['code'] = $code;
 
                     echo $view->render('login::captcha', [
-                        'captcha'    => $cap->generateImage($code),
+                        'captcha'    => new Batumibiz\Captcha\Image($code),
                         'user_login' => $user_login,
                         'user_pass'  => $user_pass,
                         'remember'   => $remember,

diff --git a/modules/registration/index.php b/modules/registration/index.php
@@ -183,8 +183,7 @@
     echo '<div class="rmenu"><p>' . _t('You can get authorized on the site after confirmation of your registration.') . '</p></div>';
 }
 
-$captcha = new Batumibiz\Captcha\Captcha;
-$code = $captcha->generateCode();
+$code = (string) new Batumibiz\Captcha\Code;
 $_SESSION['code'] = $code;
 
 echo $view->render('reg::index', [
@@ -193,5 +192,5 @@
     'reg_pass'  => $reg_pass,
     'reg_name'  => $reg_name,
     'reg_about' => $reg_about,
-    'captcha'   => $captcha->generateImage($code),
+    'captcha'   => new Batumibiz\Captcha\Image($code),
 ]);