Extensions too!

[toast/cookiecaptcha.git] / FancyCaptcha.php

diff --git a/FancyCaptcha.php b/FancyCaptcha.php
index 21931a85a0d04b63360862da63f7fe9c7e13f408..f4ce034653b10da44247f24335a0399aa34410d9 100644 (file)
--- a/FancyCaptcha.php
+++ b/FancyCaptcha.php
@@ -153,7 +153,7 @@ class FancyCaptcha extends SimpleCaptcha {
                if( !is_dir( $directory ) ) {
                        return false;
                }
-               $n = mt_rand( 0, $this->countFiles( $directory ) );
+               $n = mt_rand( 0, $this->countFiles( $directory ) - 1 );
                $dir = opendir( $directory );
 
                $count = 0;
@@ -188,7 +188,7 @@ class FancyCaptcha extends SimpleCaptcha {
                $dir = opendir( $dirname );
                $count = 0;
                while( false !== ($entry = readdir( $dir ) ) ) {
-                       if( $dir != '.' && $dir != '..' ) {
+                       if( $entry != '.' && $entry != '..' ) {
                                $count++;
                        }
                }
@@ -216,8 +216,9 @@ class FancyCaptcha extends SimpleCaptcha {
                        $file = $this->imagePath( $salt, $hash );
 
                        if( file_exists( $file ) ) {
-                               header( 'Content-type: image/png' );
-                               readfile( $file );
+                               global $IP;
+                               require_once "$IP/includes/StreamFile.php";
+                               wfStreamFile( $file );
                                return true;
                        }
                }
@@ -256,4 +257,4 @@ class FancyCaptcha extends SimpleCaptcha {
 
 } # End invocation guard
 
-?>
+