Changeset 261 for captcha/trunk/plugins

Timestamp:

10/08/06 01:23:10 (2 years ago)

Author:

ogawa

Message:

Now users can customize the captcha template.

Location:

captcha/trunk/plugins/captcha

Files:

• captcha.pl (modified) (2 diffs)
• captcha_js.cgi (modified) (1 diff)
• captcha_js.fcgi (modified) (1 diff)
• tmpl/config.tmpl (modified) (1 diff)

captcha/trunk/plugins/captcha/captcha.pl

@@ -17 +17 @@
 use Authen::Captcha;
 use base 'MT::Plugin';
-our $VERSION = '0.11';
+our $VERSION = '0.12';
 
 my $dirname = dirname(__FILE__);
@@ -38 +38 @@
         ['captcha_images_url', { Default => $cgipath . 'plugins/captcha/images/' }],
         ['captcha_images_path', { Default => File::Spec->catdir($dirname, 'images') }],
+        ['captcha_tmpl', { Default => qq(<div id="comment-captcha-block">\n\t<input type="hidden" name="captcha_md5" value="[captcha_md5]" />\n\t<label for="comment-captcha">CAPTCHA&trade; Code:</label>\n\t<img src="[captcha_img]" width="[captcha_img_width]" height="[captcha_img_height]" alt="CAPTCHA Image" />\n\t<input type="text" id="comment-captcha" name="captcha_code" value="" length="[captcha_length]" maxlength="[captcha_length]" />\n</div>\n) }],
     ]),
 });

captcha/trunk/plugins/captcha/captcha_js.cgi

@@ -49 +49 @@
         if $captcha->can('secret');
     $captcha->output_folder($cfg->{captcha_images_path});
-    my $captcha_length = $cfg->{captcha_length} || 5;
-    my $captcha_md5 = $captcha->generate_code($captcha_length);
-    my $captcha_img = $cfg->{captcha_images_url};
-    $captcha_img .= '/' if $captcha_img !~ m!/$!;
-    $captcha_img .= $captcha_md5 . '.png';
-    my $captcha_img_width = 25 * $captcha_length;
-    my $captcha_img_height = 35;
+
+    my %captcha;
+    $captcha{length} = $cfg->{captcha_length} || 5;
+    $captcha{md5} = $captcha->generate_code($captcha{length});
+    $captcha{img} = $cfg->{captcha_images_url};
+    $captcha{img} .= '/' if $captcha{img} !~ m!/$!;
+    $captcha{img} .= $captcha{md5}. '.png';
+    $captcha{img_width} = 25 * $captcha{length};
+    $captcha{img_height} = 35;
+
+    my $tmpl =  $cfg->{captcha_tmpl};
+    $tmpl =~ s/\[captcha_([^]]+)\]/$captcha{$1}/g;
 
     print $q->header('text/javascript');
-    print <<EOD;
-if (!commenter_name) {
-  document.writeln('<div id="comment-captcha-block">');
-  document.writeln('<input type="hidden" name="captcha_md5" value="$captcha_md5" />');
-  document.writeln('<label for="comment-captcha">CAPTCHA&trade; Code:</label>');
-  document.writeln('<img src="$captcha_img" width="$captcha_img_width" height="$captcha_img_height" alt="CAPTCHA Image" />');
-  document.writeln('<input type="text" id="comment-captcha" name="captcha_code" value="" length="$captcha_length" maxlength="$captcha_length" />');
-  document.writeln('</div>');
-}
-EOD
+    print "if (!commenter_name) {\n";
+    print "\tdocument.writeln('$_');\n" foreach split(/\r?\n/, $tmpl);
+    print "}\n";
 }
 

captcha/trunk/plugins/captcha/captcha_js.fcgi

@@ -53 +53 @@
         if $captcha->can('secret');
     $captcha->output_folder($cfg->{captcha_images_path});
-    my $captcha_length = $cfg->{captcha_length} || 5;
-    my $captcha_md5 = $captcha->generate_code($captcha_length);
-    my $captcha_img = $cfg->{captcha_images_url};
-    $captcha_img .= '/' if $captcha_img !~ m!/$!;
-    $captcha_img .= $captcha_md5 . '.png';
-    my $captcha_img_width = 25 * $captcha_length;
-    my $captcha_img_height = 35;
+
+    my %captcha;
+    $captcha{length} = $cfg->{captcha_length} || 5;
+    $captcha{md5} = $captcha->generate_code($captcha{length});
+    $captcha{img} = $cfg->{captcha_images_url};
+    $captcha{img} .= '/' if $captcha{img} !~ m!/$!;
+    $captcha{img} .= $captcha{md5}. '.png';
+    $captcha{img_width} = 25 * $captcha{length};
+    $captcha{img_height} = 35;
+
+    my $tmpl =  $cfg->{captcha_tmpl};
+    $tmpl =~ s/\[captcha_([^]]+)\]/$captcha{$1}/g;
 
     print $q->header('text/javascript');
-    print <<EOD;
-if (!commenter_name) {
-  document.writeln('<div id="comment-captcha-block">');
-  document.writeln('<input type="hidden" name="captcha_md5" value="$captcha_md5" />');
-  document.writeln('<label for="comment-captcha">CAPTCHA&trade; Code:</label>');
-  document.writeln('<img src="$captcha_img" width="$captcha_img_width" height="$captcha_img_height" alt="CAPTCHA Image" />');
-  document.writeln('<input type="text" id="comment-captcha" name="captcha_code" value="" length="$captcha_length" maxlength="$captcha_length" />');
-  document.writeln('</div>');
-}
-EOD
+    print "if (!commenter_name) {\n";
+    print "\tdocument.writeln('$_');\n" foreach split(/\r?\n/, $tmpl);
+    print "}\n";
 }
 

captcha/trunk/plugins/captcha/tmpl/config.tmpl

@@ -35 +35 @@
   </div>
 </div>
+<div class="setting">
+  <div class="label"><label for="captcha_tmpl"><MT_TRANS phrase="Captcha Template:"></label></div>
+  <div class="field">
+    <p>I don't recommend modifying this template if you don't know how it works.</p>
+    <textarea name="captcha_tmpl" id="captcha_tmpl" cols="60" rows="6"><TMPL_VAR NAME=CAPTCHA_TMPL ESCAPE=HTML></textarea>
+  </div>
+</div>