' . t('"CAPTCHA" is an acronym for "Completely Automated Public Turing test to tell Computers and Humans Apart". It is typically a challenge-response test to determine whether the user is human. The CAPTCHA module is a tool to fight automated submission by malicious users (spamming) of for example comments forms, user registration forms, guestbook forms, etc. You can extend the desired forms with an additional challenge, which should be easy for a human to solve correctly, but hard enough to keep automated scripts and spam bots out.') . '
'; $output .= '' . t('Note that the CAPTCHA module interacts with page caching (see performance settings). Because the challenge should be unique for each generated form, the caching of the page it appears on is prevented. Make sure that these forms do not appear on too many pages or you will lose much caching efficiency. For example, if you put a CAPTCHA on the user login block, which typically appears on each page for anonymous visitors, caching will practically be disabled. The comment submission forms are another example. In this case you should set the Location of comment submission form to Display on separate page in the comment settings of the relevant content types for better caching efficiency.', [ - ':performancesettings' => \Drupal::url('system.performance_settings'), - ':contenttypes' => \Drupal::url('entity.node_type.collection'), + ':performancesettings' => Url::fromRoute('system.performance_settings'), + ':contenttypes' => Url::fromRoute('entity.node_type.collection'), ]) . '
'; $output .= '' . t('CAPTCHA is a trademark of Carnegie Mellon University.') . '
'; return ['#markup' => $output]; @@ -61,10 +62,10 @@ function captcha_help($route_name, RouteMatchInterface $route_match) { case 'captcha_settings': $output = '' . t('A CAPTCHA can be added to virtually each Drupal form. Some default forms are already provided in the form list, but arbitrary forms can be easily added and managed when the option Add CAPTCHA administration links to forms is enabled.') . '
'; $output .= '' . t('Users with the Skip CAPTCHA permission won\'t be offered a challenge. Be sure to grant this permission to the trusted users (e.g. site administrators). If you want to test a protected form, be sure to do it as a user without the Skip CAPTCHA permission (e.g. as anonymous user).', [ - ':perm' => \Drupal::url('user.admin_permissions'), + ':perm' => Url::fromRoute('user.admin_permissions'), ]) . '
'; $output .= '' . t('Note that the CAPTCHA module disables page caching of pages that include a CAPTCHA challenge.', [ - ':performancesettings' => \Drupal::url('system.performance_settings'), + ':performancesettings' => Url::fromRoute('system.performance_settings'), ]) . '
'; return ['#markup' => $output]; } @@ -123,7 +124,7 @@ function template_preprocess_captcha(&$variables) { '#type' => 'details', '#title' => t('CAPTCHA'), '#description' => $element['#description'], - '#children' => drupal_render_children($element), + '#children' => Element::children($element), '#attributes' => [ 'class' => ['captcha'], 'open' => [''], @@ -356,7 +357,7 @@ function _captcha_get_posted_captcha_info(array $element, FormStateInterface $fo // and the database query should also be more efficient (because there is // an index on the CAPTCHA session ID). if ($posted_captcha_sid != NULL) { - $expected_captcha_token = db_query( + $expected_captcha_token = \Drupal::database()->query( "SELECT token FROM {captcha_sessions} WHERE csid = :csid", [':csid' => $posted_captcha_sid] )->fetchField(); @@ -366,7 +367,7 @@ function _captcha_get_posted_captcha_info(array $element, FormStateInterface $fo $posted_captcha_sid = NULL; } // Invalidate CAPTCHA token to avoid reuse. - db_update('captcha_sessions') + \Drupal::database()->update('captcha_sessions') ->fields(['token' => NULL]) ->condition('csid', $posted_captcha_sid); } @@ -400,7 +401,7 @@ function captcha_validate($element, FormStateInterface &$form_state) { // TODO: is this correct in all cases: see comments in previous revisions? $csid = $captcha_info['captcha_sid']; - $solution = db_query( + $solution = \Drupal::database()->query( 'SELECT solution FROM {captcha_sessions} WHERE csid = :csid', [':csid' => $csid] ) @@ -431,7 +432,7 @@ function captcha_validate($element, FormStateInterface &$form_state) { // Correct answer. $_SESSION['captcha_success_form_ids'][$form_id] = $form_id; // Record success. - db_update('captcha_sessions') + \Drupal::database()->update('captcha_sessions') ->condition('csid', $csid) ->fields(['status' => CAPTCHA_STATUS_SOLVED]) ->expression('attempts', 'attempts + 1') @@ -439,7 +440,7 @@ function captcha_validate($element, FormStateInterface &$form_state) { } else { // Wrong answer. - db_update('captcha_sessions') + \Drupal::database()->update('captcha_sessions') ->condition('csid', $csid) ->expression('attempts', 'attempts + 1') ->execute(); diff --git a/image_captcha/src/Response/CaptchaImageResponse.php b/image_captcha/src/Response/CaptchaImageResponse.php index d4c81db..d5b652f 100755 --- a/image_captcha/src/Response/CaptchaImageResponse.php +++ b/image_captcha/src/Response/CaptchaImageResponse.php @@ -51,7 +51,7 @@ class CaptchaImageResponse extends Response { public function prepare(Request $request) { $session_id = $request->get('session_id'); - $code = db_query("SELECT solution FROM {captcha_sessions} WHERE csid = :csid", + $code = \Drupal::database()->query("SELECT solution FROM {captcha_sessions} WHERE csid = :csid", [':csid' => $session_id] )->fetchField(); @@ -374,7 +374,7 @@ class CaptchaImageResponse extends Response { // Get character dimensions for TrueType fonts. if ($font != 'BUILTIN') { putenv('GDFONTPATH=' . realpath('.')); - $bbox = imagettfbbox($font_size, 0, drupal_realpath($font), $character); + $bbox = imagettfbbox($font_size, 0, \Drupal::service('file_system')->realpath($font), $character); // In very rare cases with some versions of the GD library, the x-value // of the left side of the bounding box as returned by the first call of // imagettfbbox is corrupt (value -2147483648 = 0x80000000). @@ -382,7 +382,7 @@ class CaptchaImageResponse extends Response { // can be used as workaround. // This issue is discussed at http://drupal.org/node/349218. if ($bbox[2] < 0) { - $bbox = imagettfbbox($font_size, 0, drupal_realpath($font), $character); + $bbox = imagettfbbox($font_size, 0, \Drupal::service('file_system')->realpath($font), $character); } } else { @@ -438,7 +438,7 @@ class CaptchaImageResponse extends Response { imagestring($image, 5, $pos_x, $pos_y, $character, $color); } else { - imagettftext($image, $font_size, $angle, $pos_x, $pos_y, $color, drupal_realpath($font), $character); + imagettftext($image, $font_size, $angle, $pos_x, $pos_y, $color, \Drupal::service('file_system')->realpath($font), $character); } } diff --git a/src/Element/Captcha.php b/src/Element/Captcha.php index 2c76d8f..a74ce6a 100644 --- a/src/Element/Captcha.php +++ b/src/Element/Captcha.php @@ -74,7 +74,7 @@ class Captcha extends FormElement { // not reuse one from a posted form. $captcha_sid = _captcha_generate_captcha_session($this_form_id, CAPTCHA_STATUS_UNSOLVED); $captcha_token = md5(mt_rand()); - db_update('captcha_sessions') + \Drupal::database()->update('captcha_sessions') ->fields(['token' => $captcha_token]) ->condition('csid', $captcha_sid) ->execute(); @@ -96,7 +96,7 @@ class Captcha extends FormElement { // ->fields(['token' => $captcha_token]) // ->condition('csid', $captcha_sid) // ->execute(); - $captcha_token = db_query("SELECT token FROM {captcha_sessions} WHERE csid = :csid", [':csid' => $captcha_sid])->fetchField(); + $captcha_token = \Drupal::database()->query("SELECT token FROM {captcha_sessions} WHERE csid = :csid", [':csid' => $captcha_sid])->fetchField(); $element['captcha_token'] = [ '#type' => 'hidden', '#value' => $captcha_token, diff --git a/src/Tests/CaptchaBaseWebTestCase.php b/src/Tests/CaptchaBaseWebTestCase.php index 267938e..d4dd2d3 100755 --- a/src/Tests/CaptchaBaseWebTestCase.php +++ b/src/Tests/CaptchaBaseWebTestCase.php @@ -6,6 +6,7 @@ use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface; use Drupal\comment\Tests\CommentTestTrait; use Drupal\field\Entity\FieldConfig; use Drupal\simpletest\WebTestBase; +use Drupal\Core\Session\AccountInterface; /** * The TODO list. @@ -270,7 +271,7 @@ abstract class CaptchaBaseWebTestCase extends WebTestBase { */ protected function allowCommentPostingForAnonymousVisitors() { // Enable anonymous comments. - user_role_grant_permissions(DRUPAL_ANONYMOUS_RID, [ + user_role_grant_permissions(AccountInterface::ANONYMOUS_ROLE, [ 'access comments', 'post comments', 'skip comment approval', diff --git a/src/Tests/CaptchaTestCase.php b/src/Tests/CaptchaTestCase.php index 924c1f7..4a8cdaf 100755 --- a/src/Tests/CaptchaTestCase.php +++ b/src/Tests/CaptchaTestCase.php @@ -2,6 +2,7 @@ namespace Drupal\captcha\Tests; +use Drupal\Core\Entity\Entity\EntityFormDisplay; use Drupal\Core\Field\FieldStorageDefinitionInterface; use Drupal\field\Entity\FieldConfig; use Drupal\field\Entity\FieldStorageConfig; @@ -218,7 +219,7 @@ class CaptchaTestCase extends CaptchaBaseWebTestCase { */ public function testAjaxFormRebuild() { // Setup captcha point for user edit form. - \Drupal::entityManager()->getStorage('captcha_point')->create([ + \Drupal::entityTypeManager()->getStorage('captcha_point')->create([ 'id' => 'user_form', 'formId' => 'user_form', 'status' => TRUE, @@ -237,7 +238,7 @@ class CaptchaTestCase extends CaptchaBaseWebTestCase { 'field_storage' => $field_storage_config, 'bundle' => 'user', ])->save(); - entity_get_form_display('user', 'user', 'default') + EntityFormDisplay::load('user.user.default') ->setComponent('field_texts', [ 'type' => 'string_textfield', 'weight' => 10,