CodeIgniter 3.1.11 -> 3.4.5 (pocketarc fork) en PHP 8.3-fixes
- system/ vervangen door CodeIgniter 3.4.5 (pocketarc/codeigniter, PHP 8.2-8.5 compatibel) - config.php, mimes.php, user_agents.php en error-views bijgewerkt naar 3.4.5 - composer.json: php-constraint "^7.4 || ^8.0" zodat composer install op 8.3 werkt - PHP 8-fatals opgelost: count()/array-functies op FALSE/null, rekenen met lege strings, delen door nul, property zetten op FALSE, curly-brace string offsets, ongedefinieerde constanten, foute curl_setopt in Phantom_model::create_img - dynamic properties gedeclareerd in libraries, optionele parameters voor verplichte opgelost - vergelijkingen waar '' == 0 in PHP 8 anders uitvalt gecast naar (int) Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Claude Opus 5.5
@@ -6,7 +6,7 @@
|
||||
*
|
||||
* This content is released under the MIT License (MIT)
|
||||
*
|
||||
* Copyright (c) 2014 - 2019, British Columbia Institute of Technology
|
||||
* Copyright (c) 2019 - 2022, CodeIgniter Foundation
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
@@ -30,6 +30,7 @@
|
||||
* @author EllisLab Dev Team
|
||||
* @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
|
||||
* @copyright Copyright (c) 2014 - 2019, British Columbia Institute of Technology (https://bcit.ca/)
|
||||
* @copyright Copyright (c) 2019 - 2022, CodeIgniter Foundation (https://codeigniter.com/)
|
||||
* @license https://opensource.org/licenses/MIT MIT License
|
||||
* @link https://codeigniter.com
|
||||
* @since Version 1.0.0
|
||||
@@ -44,7 +45,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
|
||||
* @subpackage Helpers
|
||||
* @category Helpers
|
||||
* @author EllisLab Dev Team
|
||||
* @link https://codeigniter.com/user_guide/helpers/captcha_helper.html
|
||||
* @link https://codeigniter.com/userguide3/helpers/captcha_helper.html
|
||||
*/
|
||||
|
||||
// ------------------------------------------------------------------------
|
||||
@@ -54,13 +55,10 @@ if ( ! function_exists('create_captcha'))
|
||||
/**
|
||||
* Create CAPTCHA
|
||||
*
|
||||
* @param array $data Data for the CAPTCHA
|
||||
* @param string $img_path Path to create the image in (deprecated)
|
||||
* @param string $img_url URL to the CAPTCHA image folder (deprecated)
|
||||
* @param string $font_path Server path to font (deprecated)
|
||||
* @return string
|
||||
* @param array $data Data for the CAPTCHA
|
||||
* @return array
|
||||
*/
|
||||
function create_captcha($data = '', $img_path = '', $img_url = '', $font_path = '')
|
||||
function create_captcha($data)
|
||||
{
|
||||
$defaults = array(
|
||||
'word' => '',
|
||||
@@ -68,10 +66,12 @@ if ( ! function_exists('create_captcha'))
|
||||
'img_url' => '',
|
||||
'img_width' => '150',
|
||||
'img_height' => '30',
|
||||
'img_alt' => 'captcha',
|
||||
'img_class' => '',
|
||||
'font_path' => '',
|
||||
'font_size' => 16,
|
||||
'expiration' => 7200,
|
||||
'word_length' => 8,
|
||||
'font_size' => 16,
|
||||
'img_id' => '',
|
||||
'pool' => '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ',
|
||||
'colors' => array(
|
||||
@@ -82,6 +82,8 @@ if ( ! function_exists('create_captcha'))
|
||||
)
|
||||
);
|
||||
|
||||
$now = microtime(TRUE);
|
||||
|
||||
foreach ($defaults as $key => $val)
|
||||
{
|
||||
if ( ! is_array($data) && empty($$key))
|
||||
@@ -94,30 +96,59 @@ if ( ! function_exists('create_captcha'))
|
||||
}
|
||||
}
|
||||
|
||||
if ($img_path === '' OR $img_url === ''
|
||||
OR ! is_dir($img_path) OR ! is_really_writable($img_path)
|
||||
OR ! extension_loaded('gd'))
|
||||
if ( ! extension_loaded('gd'))
|
||||
{
|
||||
log_message('error', 'create_captcha(): GD extension is not loaded.');
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
// -----------------------------------
|
||||
// Remove old images
|
||||
// -----------------------------------
|
||||
|
||||
$now = microtime(TRUE);
|
||||
|
||||
$current_dir = @opendir($img_path);
|
||||
while ($filename = @readdir($current_dir))
|
||||
if ($img_path === '' OR $img_url === '')
|
||||
{
|
||||
if (in_array(substr($filename, -4), array('.jpg', '.png'))
|
||||
&& (str_replace(array('.jpg', '.png'), '', $filename) + $expiration) < $now)
|
||||
{
|
||||
@unlink($img_path.$filename);
|
||||
}
|
||||
log_message('error', 'create_captcha(): img_path and img_url are required.');
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
@closedir($current_dir);
|
||||
if ( ! is_dir($img_path) OR ! is_really_writable($img_path))
|
||||
{
|
||||
log_message('error', "create_captcha(): '{$img_path}' is not a dir, nor is it writable.");
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
if ($img_url !== '' OR $img_path !== '')
|
||||
{
|
||||
if ($img_path === '' OR $img_url === '')
|
||||
{
|
||||
log_message('error', 'create_captcha(): $img_path and $img_url are required.');
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
if ( ! is_dir($img_path) OR ! is_really_writable($img_path))
|
||||
{
|
||||
log_message('error', "create_captcha(): '{$img_path}' is not a dir, nor is it writable.");
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove old images
|
||||
*/
|
||||
$current_dir = @opendir($img_path);
|
||||
while ($filename = @readdir($current_dir))
|
||||
{
|
||||
if (preg_match('#^(?<ts>\d{10})\.png$#', $filename, $match) && ($match['ts'] + $expiration) < $now)
|
||||
{
|
||||
@unlink($img_path.$filename);
|
||||
}
|
||||
}
|
||||
|
||||
@closedir($current_dir);
|
||||
|
||||
// This variable will later be used later to determine whether we write to disk or output a data:image URI
|
||||
$img_filename = $now.'.png';
|
||||
}
|
||||
else
|
||||
{
|
||||
$img_filename = NULL;
|
||||
}
|
||||
|
||||
// -----------------------------------
|
||||
// Do we have a "word" yet?
|
||||
@@ -227,9 +258,9 @@ if ( ! function_exists('create_captcha'))
|
||||
// Determine angle and position
|
||||
// -----------------------------------
|
||||
$length = strlen($word);
|
||||
$angle = ($length >= 6) ? mt_rand(-($length-6), ($length-6)) : 0;
|
||||
$x_axis = mt_rand(6, (360/$length)-16);
|
||||
$y_axis = ($angle >= 0) ? mt_rand($img_height, $img_width) : mt_rand(6, $img_height);
|
||||
$angle = ($length >= 6) ? mt_rand(-($length - 6), ($length - 6)) : 0;
|
||||
$x_axis = mt_rand(6, (int) ((360 / $length) - 16));
|
||||
$y_axis = ($angle >= 0) ? mt_rand((int) $img_height, (int) $img_width) : mt_rand(6, (int) $img_height);
|
||||
|
||||
// Create image
|
||||
// PHP.net recommends imagecreatetruecolor(), but it isn't always available
|
||||
@@ -266,12 +297,12 @@ if ( ! function_exists('create_captcha'))
|
||||
{
|
||||
$theta += $thetac;
|
||||
$rad = $radius * ($i / $points);
|
||||
$x = ($rad * cos($theta)) + $x_axis;
|
||||
$y = ($rad * sin($theta)) + $y_axis;
|
||||
$x = round(($rad * cos($theta)) + $x_axis);
|
||||
$y = round(($rad * sin($theta)) + $y_axis);
|
||||
$theta += $thetac;
|
||||
$rad1 = $radius * (($i + 1) / $points);
|
||||
$x1 = ($rad1 * cos($theta)) + $x_axis;
|
||||
$y1 = ($rad1 * sin($theta)) + $y_axis;
|
||||
$x1 = round(($rad1 * cos($theta)) + $x_axis);
|
||||
$y1 = round(($rad1 * sin($theta)) + $y_axis);
|
||||
imageline($im, $x, $y, $x1, $y1, $colors['grid']);
|
||||
$theta -= $thetac;
|
||||
}
|
||||
@@ -284,13 +315,13 @@ if ( ! function_exists('create_captcha'))
|
||||
if ($use_font === FALSE)
|
||||
{
|
||||
($font_size > 5) && $font_size = 5;
|
||||
$x = mt_rand(0, $img_width / ($length / 3));
|
||||
$x = mt_rand(0, (int) ($img_width / ($length / 3)));
|
||||
$y = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
($font_size > 30) && $font_size = 30;
|
||||
$x = mt_rand(0, $img_width / ($length / 1.5));
|
||||
$x = mt_rand(0, (int) ($img_width / ($length / 1.5)));
|
||||
$y = $font_size + 2;
|
||||
}
|
||||
|
||||
@@ -298,13 +329,13 @@ if ( ! function_exists('create_captcha'))
|
||||
{
|
||||
if ($use_font === FALSE)
|
||||
{
|
||||
$y = mt_rand(0 , $img_height / 2);
|
||||
$y = mt_rand(0, (int) ($img_height / 2));
|
||||
imagestring($im, $font_size, $x, $y, $word[$i], $colors['text']);
|
||||
$x += ($font_size * 2);
|
||||
}
|
||||
else
|
||||
{
|
||||
$y = mt_rand($img_height / 2, $img_height - 3);
|
||||
$y = mt_rand((int) ($img_height / 2), (int) ($img_height - 3));
|
||||
imagettftext($im, $font_size, $angle, $x, $y, $colors['text'], $font_path, $word[$i]);
|
||||
$x += $font_size;
|
||||
}
|
||||
@@ -316,25 +347,38 @@ if ( ! function_exists('create_captcha'))
|
||||
// -----------------------------------
|
||||
// Generate the image
|
||||
// -----------------------------------
|
||||
$img_url = rtrim($img_url, '/').'/';
|
||||
|
||||
if (function_exists('imagejpeg'))
|
||||
if (isset($img_filename))
|
||||
{
|
||||
$img_filename = $now.'.jpg';
|
||||
imagejpeg($im, $img_path.$img_filename);
|
||||
}
|
||||
elseif (function_exists('imagepng'))
|
||||
{
|
||||
$img_filename = $now.'.png';
|
||||
$img_src = rtrim($img_url, '/').'/'.$img_filename;
|
||||
imagepng($im, $img_path.$img_filename);
|
||||
}
|
||||
else
|
||||
{
|
||||
return FALSE;
|
||||
// I don't see an easier way to get the image contents without writing to file
|
||||
$buffer = fopen('php://memory', 'wb+');
|
||||
imagepng($im, $buffer);
|
||||
rewind($buffer);
|
||||
$img_src = '';
|
||||
|
||||
// fread() will return an empty string (not FALSE) after the entire contents are read
|
||||
while (strlen($read = fread($buffer, 4096)))
|
||||
{
|
||||
$img_src .= $read;
|
||||
}
|
||||
|
||||
fclose($buffer);
|
||||
$img_src = 'data:image/png;base64,'.base64_encode($img_src);
|
||||
}
|
||||
|
||||
$img = '<img '.($img_id === '' ? '' : 'id="'.$img_id.'"').' src="'.$img_url.$img_filename.'" style="width: '.$img_width.'px; height: '.$img_height .'px; border: 0;" alt=" " />';
|
||||
ImageDestroy($im);
|
||||
$img_class = trim($img_class);
|
||||
$img_class = (bool) strlen($img_class) ? 'class="'.$img_class.'" ' : '';
|
||||
|
||||
$img = '<img '.($img_id === '' ? '' : 'id="'.$img_id.'"').' src="'.$img_src.'" style="width: '.$img_width.'px; height: '.$img_height .'px; border: 0;" '.$img_class.'alt="'.$img_alt.'" />';
|
||||
if (PHP_VERSION_ID < 80000)
|
||||
{
|
||||
imagedestroy($im);
|
||||
}
|
||||
|
||||
return array('word' => $word, 'time' => $now, 'image' => $img, 'filename' => $img_filename);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user