' . t('The ASCII art CAPTCHA shows a random character code in ASCII art style. Example with current settings:') . '
'; $captcha = ascii_art_captcha_captcha('generate', 'ASCII art CAPTCHA'); $output .= $captcha['form']['ascii']['#value']; return $output; @@ -18,7 +18,7 @@ function ascii_art_captcha_help($path, $arg) { */ function ascii_art_captcha_menu() { $items = array(); - $items['admin/user/captcha/ascii_art_captcha'] = array( + $items['admin/config/people/captcha/ascii_art_captcha'] = array( 'title' => 'ASCII art CAPTCHA', 'file' => 'ascii_art_captcha.admin.inc', 'page callback' => 'drupal_get_form', @@ -61,10 +61,10 @@ function ascii_art_captcha_captcha($op, $captcha_type='', $response='') { $code_length = (int) variable_get('ascii_art_captcha_code_length', 6); // load font $font_name = variable_get('ascii_art_captcha_font', 'standard'); - if (!include_once('fonts/ascii_art_captcha_font_'. $font_name .'.inc')) { + if (!include_once('fonts/ascii_art_captcha_font_' . $font_name . '.inc')) { return; } - $font = call_user_func('ascii_art_captcha_font_'. $font_name); + $font = call_user_func('ascii_art_captcha_font_' . $font_name); if (!$font) { return; } @@ -78,7 +78,7 @@ function ascii_art_captcha_captcha($op, $captcha_type='', $response='') { $character = $allowed_chars[array_rand($allowed_chars)]; $solution .= $character; foreach ($font[$character] as $l => $cline) { - $ascii_lines[$l] .= ' '. check_plain($cline); + $ascii_lines[$l] .= ' ' . check_plain($cline); } } // build CAPTCHA array @@ -86,11 +86,11 @@ function ascii_art_captcha_captcha($op, $captcha_type='', $response='') { $captcha['solution'] = $solution; $style = 'line-height:1.1;'; if (variable_get('ascii_art_captcha_font_size', 0)) { - $style .= 'font-size:'. variable_get('ascii_art_captcha_font_size', 0) .'pt;'; + $style .= 'font-size:' . variable_get('ascii_art_captcha_font_size', 0) . 'pt;'; } $captcha['form']['ascii'] = array( '#type' => 'markup', - '#value' => ''. implode('
', $ascii_lines) .'',
+ '#value' => '' . implode('
', $ascii_lines) . '',
);
$captcha['form']['captcha_response'] = array(
'#type' => 'textfield',
diff --git a/ascii_art_captcha/fonts/ascii_art_captcha_font_alphabet.inc b/ascii_art_captcha/fonts/ascii_art_captcha_font_alphabet.inc
old mode 100644
new mode 100755
index 8980314..6d07f0d
--- a/ascii_art_captcha/fonts/ascii_art_captcha_font_alphabet.inc
+++ b/ascii_art_captcha/fonts/ascii_art_captcha_font_alphabet.inc
@@ -1,4 +1,6 @@
'. t('The CSS CAPTCHA uses CSS tricks to obfuscate a random text code for spam bots. The characters of the code are scrambled in the HTML markup but are displayed in the correct order when rendered with a CSS capable browser.') .'' ;
+ case 'admin/config/people/captcha/css_captcha':
+ return '' . t('The CSS CAPTCHA uses CSS tricks to obfuscate a random text code for spam bots. The characters of the code are scrambled in the HTML markup but are displayed in the correct order when rendered with a CSS capable browser.') . '
' ; } } @@ -19,7 +19,7 @@ function css_captcha_help($path, $arg) { */ function css_captcha_menu() { $items = array(); - $items['admin/user/captcha/css_captcha'] = array( + $items['admin/config/people/captcha/css_captcha'] = array( 'title' => 'CSS CAPTCHA', 'file' => 'css_captcha.admin.inc', 'page callback' => 'drupal_get_form', @@ -61,12 +61,12 @@ function css_captcha_captcha($op, $captcha_type='', $response='') { if (mt_rand(0, 1)) { // normal merge: $item_left first and $item_right second $merged_content = "' . t('This is a very simple CAPTCHA, which requires users to enter "foo" in a textfield.') . '
'; } } @@ -15,7 +15,7 @@ function foo_captcha_help($path, $arg) { */ function foo_captcha_menu() { $items = array(); - $items['admin/user/captcha/foo_captcha'] = array( + $items['admin/config/people/captcha/foo_captcha'] = array( 'title' => 'Foo CAPTCHA', 'page callback' => 'drupal_get_form', 'page arguments' => array('foo_captcha_settings_form'), @@ -65,7 +65,7 @@ function foo_captcha_captcha($op, $captcha_type='') { /** * Process the response to the foo CAPTCHA before validation. */ -function foo_captcha_process($element, $edit, &$form_state, $complete_form) { +function foo_captcha_process($element, $edit) { if (variable_get('foo_captcha_ignore_spaces', FALSE)) { $element['#value'] = preg_replace('/\s*/', '', $element['#value']); } diff --git a/math_captcha/math_captcha.admin.inc b/math_captcha/math_captcha.admin.inc old mode 100644 new mode 100755 index 799abb3..54c2836 --- a/math_captcha/math_captcha.admin.inc +++ b/math_captcha/math_captcha.admin.inc @@ -1,5 +1,5 @@ 'Math CAPTCHA', 'file' => 'math_captcha.admin.inc', 'page callback' => 'drupal_get_form', diff --git a/random_captcha_type/random_captcha_type.admin.inc b/random_captcha_type/random_captcha_type.admin.inc old mode 100644 new mode 100755 index 8d437c2..3eccceb --- a/random_captcha_type/random_captcha_type.admin.inc +++ b/random_captcha_type/random_captcha_type.admin.inc @@ -1,5 +1,5 @@ '. t('This CAPTCHA type is a "meta" CAPTCHA type, which randomly picks one of the selected CAPTCHA types.') .''; + case 'admin/config/people/captcha/random_captcha_type': + return '' . t('This CAPTCHA type is a "meta" CAPTCHA type, which randomly picks one of the selected CAPTCHA types.') . '
'; } } @@ -20,7 +20,7 @@ function random_captcha_type_help($path, $arg) { function random_captcha_type_menu() { $items = array(); // add an administration tab for random_captcha_type - $items['admin/user/captcha/random_captcha_type'] = array( + $items['admin/config/people/captcha/random_captcha_type'] = array( 'title' => 'Random CAPTCHA type', 'file' => 'random_captcha_type.admin.inc', 'page callback' => 'drupal_get_form', diff --git a/text_captcha/lost_character_captcha/lost_character_captcha.admin.inc b/text_captcha/lost_character_captcha/lost_character_captcha.admin.inc old mode 100644 new mode 100755 index 6b783e7..bf7e497 --- a/text_captcha/lost_character_captcha/lost_character_captcha.admin.inc +++ b/text_captcha/lost_character_captcha/lost_character_captcha.admin.inc @@ -1,5 +1,5 @@ '. t('The challenge in this CAPTCHA is to determine the lost character(s) of a given word.') .''; + case 'admin/config/people/captcha/lost_character_captcha': + return '' . t('The challenge in this CAPTCHA is to determine the lost character(s) of a given word.') . '
'; } } @@ -20,7 +20,7 @@ function lost_character_captcha_help($path, $arg) { */ function lost_character_captcha_menu() { $items = array(); - $items['admin/user/captcha/lost_character_captcha'] = array( + $items['admin/config/people/captcha/lost_character_captcha'] = array( 'title' => 'Lost characters', 'file' => 'lost_character_captcha.admin.inc', 'page callback' => 'drupal_get_form', @@ -96,7 +96,7 @@ function lost_character_captcha_captcha($op, $captcha_type='') { /** * Process the response before validation. */ -function lost_character_process($element, $edit, &$form_state, $complete_form) { +function lost_character_process($element, $edit) { $response = $element['#value']; // remove white spaces $parts = _text_captcha_whitespace_explode($response); diff --git a/text_captcha/phrase_captcha/phrase_captcha.admin.inc b/text_captcha/phrase_captcha/phrase_captcha.admin.inc old mode 100644 new mode 100755 index f8bbc25..979f94f --- a/text_captcha/phrase_captcha/phrase_captcha.admin.inc +++ b/text_captcha/phrase_captcha/phrase_captcha.admin.inc @@ -1,13 +1,11 @@ '. t('This phrase based CAPTCHA presents a CAPTCHA phrase of a given number of words and asks to pick the right word (based on counting, alphabetical order, etc).') .''; + case 'admin/config/people/captcha/phrase_captcha': + return '' . t('This phrase based CAPTCHA presents a CAPTCHA phrase of a given number of words and asks to pick the right word (based on counting, alphabetical order, etc).') . '
'; } } @@ -28,7 +28,7 @@ function phrase_captcha_help($path, $arg) { function phrase_captcha_menu() { $items = array(); // add an administration tab for phrase_captcha - $items['admin/user/captcha/phrase_captcha'] = array( + $items['admin/config/people/captcha/phrase_captcha'] = array( 'title' => 'Phrase CAPTCHA', 'file' => 'phrase_captcha.admin.inc', 'page callback' => 'drupal_get_form', @@ -68,7 +68,7 @@ function phrase_captcha_captcha($op, $captcha_type='') { $captcha['solution'] = $solution; $captcha['form']['captcha_phrase'] = array( '#type' => 'markup', - '#value' => '"'. implode(' ', $phrase_words) .'"', + '#value' => '"' . implode(' ', $phrase_words) . '"', '#weight' => -2, ); $captcha['form']['captcha_response'] = array( @@ -87,7 +87,7 @@ function phrase_captcha_captcha($op, $captcha_type='') { '#required' => TRUE, ); // additional text CAPTCHA CSS rules - drupal_add_css(drupal_get_path('module', 'phrase_captcha') .'/../text_captcha.css'); + drupal_add_css(drupal_get_path('module', 'phrase_captcha') . '/../text_captcha.css'); return $captcha; } } diff --git a/text_captcha/text_captcha.css b/text_captcha/text_captcha.css old mode 100644 new mode 100755 diff --git a/text_captcha/text_captcha.inc b/text_captcha/text_captcha.inc old mode 100644 new mode 100755 diff --git a/text_captcha/word_list_captcha/word_list_captcha.admin.inc b/text_captcha/word_list_captcha/word_list_captcha.admin.inc old mode 100644 new mode 100755 index 956837d..7e638c4 --- a/text_captcha/word_list_captcha/word_list_captcha.admin.inc +++ b/text_captcha/word_list_captcha/word_list_captcha.admin.inc @@ -1,10 +1,9 @@ '. t('The unrelated word CAPTCHA consists of a list of closely related words with one non-related word, which the user has to select. To generate this list, two word pools are needed: one for the related words and one for the non-related word.') .''; + case 'admin/config/people/captcha/word_list_captcha': + return '' . t('The unrelated word CAPTCHA consists of a list of closely related words with one non-related word, which the user has to select. To generate this list, two word pools are needed: one for the related words and one for the non-related word.') . '
'; } } @@ -21,7 +21,7 @@ function word_list_captcha_help($path, $arg) { function word_list_captcha_menu() { $items = array(); // add an administration tab for phrase_captcha - $items['admin/user/captcha/word_list_captcha'] = array( + $items['admin/config/people/captcha/word_list_captcha'] = array( 'title' => 'Unrelated word', 'file' => 'word_list_captcha.admin.inc', 'page callback' => 'drupal_get_form', @@ -90,7 +90,7 @@ function word_list_captcha_captcha($op, $captcha_type='', $post_data=array()) { '#required' => TRUE, ); // additional text CAPTCHA CSS rules - drupal_add_css(drupal_get_path('module', 'word_list_captcha') .'/../text_captcha.css'); + drupal_add_css(drupal_get_path('module', 'word_list_captcha') . '/../text_captcha.css'); return $captcha; } break;