diff options
| author | David M <davidmj@users.sourceforge.net> | 2006-02-22 22:17:36 +0000 |
|---|---|---|
| committer | David M <davidmj@users.sourceforge.net> | 2006-02-22 22:17:36 +0000 |
| commit | ac011448ab843e8d892cb38107d05131df2ba2bf (patch) | |
| tree | ea63ae699dd10dff58a55b7933efa10aed099c37 /phpBB/includes/ucp/ucp_confirm.php | |
| parent | 6b13f94be9fdd4054e08d593f5c871a11853344e (diff) | |
| download | forums-ac011448ab843e8d892cb38107d05131df2ba2bf.tar forums-ac011448ab843e8d892cb38107d05131df2ba2bf.tar.gz forums-ac011448ab843e8d892cb38107d05131df2ba2bf.tar.bz2 forums-ac011448ab843e8d892cb38107d05131df2ba2bf.tar.xz forums-ac011448ab843e8d892cb38107d05131df2ba2bf.zip | |
- Remove the BBCode UIDs from the output
- Faster generation of CAPTCHA images
git-svn-id: file:///svn/phpbb/trunk@5575 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/ucp/ucp_confirm.php')
| -rw-r--r-- | phpBB/includes/ucp/ucp_confirm.php | 63 |
1 files changed, 39 insertions, 24 deletions
diff --git a/phpBB/includes/ucp/ucp_confirm.php b/phpBB/includes/ucp/ucp_confirm.php index efbde293f0..92f7512baf 100644 --- a/phpBB/includes/ucp/ucp_confirm.php +++ b/phpBB/includes/ucp/ucp_confirm.php @@ -191,36 +191,51 @@ class ucp_confirm else { // The total length of this image, uncompressed, is just a calculation of pixels - $len = $temp_len = ($width + 1) * $height; + $len = ($width + 1) * $height; - // Optimized Adler-32 loop ported from the GNU Classpath project - $s1 = 1; - $s2 = 0; - $i = 0; - while ($temp_len > 0) + // Adler-32 hash generation + // Note: The hash is _backwards_ so we must reverse it + + if (@extension_loaded('hash')) { - // We can defer the modulo operation: - // s1 maximally grows from 65521 to 65521 + 255 * 3800 - // s2 maximally grows by 3800 * median(s1) = 2090079800 < 2^31 - $n = 3800; - if ($n > $temp_len) - { - $n = $temp_len; - } - $temp_len -= $n; - while (--$n >= 0) + $adler_hash = hash('adler32', $raw_image, true); + } + else if (@extension_loaded('mhash')) + { + $adler_hash = mhash(MHASH_ADLER32, $raw_image); + } + else + { + // Optimized Adler-32 loop ported from the GNU Classpath project + $temp_len = $len; + $s1 = 1; + $s2 = 0; + $i = 0; + while ($temp_len > 0) { - $s1 += (ord($raw_image[$i++]) & 255); - $s2 += $s1; + // We can defer the modulo operation: + // s1 maximally grows from 65521 to 65521 + 255 * 3800 + // s2 maximally grows by 3800 * median(s1) = 2090079800 < 2^31 + $n = 3800; + if ($n > $temp_len) + { + $n = $temp_len; + } + $temp_len -= $n; + while (--$n >= 0) + { + $s1 += (ord($raw_image[$i++]) & 255); + $s2 += $s1; + } + $s1 %= 65521; + $s2 %= 65521; } - $s1 %= 65521; - $s2 %= 65521; + $adler = ($s2 << 16) | $s1; + $adler_hash = pack('C4', $adler & 255, ($adler >> 8) & 255, ($adler >> 16) & 255, ($adler >> 24) & 255); } - $adler = ($s2 << 16) | $s1; - // This is the same thing as gzcompress($raw_image, 0) - $raw_image = pack('C7', 0x78, 0x01, 0x01, $len, ($len >> 8) & 255, ~$len & 255, ~($len >> 8)) . $raw_image; - $raw_image .= pack('C4', ($adler >> 24) & 255, ($adler >> 16) & 255, ($adler >> 8) & 255, $adler & 255); + // This is the same thing as gzcompress($raw_image, 0) but does not need zlib + $raw_image = pack('C7', 0x78, 0x01, 0x01, $len, ($len >> 8) & 255, ~$len & 255, ~($len >> 8)) . $raw_image . strrev($adler_hash); // The Zlib header + Adler hash make us add on 11 $len += 11; |