WrenchBoard/WrenchBoradWeb
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Update CodeIgniter system 3.1.0 => 3.1.16

Browse Source
This commit is contained in:
Olusesan Ameye
2020-08-02 02:23:47 -04:00
parent 3523bc5f57
commit 083b534f0a
176 changed files with 2351 additions and 1889 deletions
Download Patch File Download Diff File Expand all files Collapse all files
www/system/helpers/captcha_helper.php
+10 -9
View File
@@ -6,7 +6,7 @@
*
* This content is released under the MIT License (MIT)
*
* Copyright (c) 2014 - 2016, British Columbia Institute of Technology
* Copyright (c) 2014 - 2019, British Columbia Institute of Technology
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -29,8 +29,8 @@
* @package CodeIgniter
* @author EllisLab Dev Team
* @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
* @copyright Copyright (c) 2014 - 2016, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://opensource.org/licenses/MIT MIT License
* @copyright Copyright (c) 2014 - 2019, British Columbia Institute of Technology (https://bcit.ca/)
* @license https://opensource.org/licenses/MIT MIT License
* @link https://codeigniter.com
* @since Version 1.0.0
* @filesource
@@ -54,10 +54,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
* @param string $img_url URL to the CAPTCHA image folder
* @param string $font_path server path to font
* @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
*/
function create_captcha($data = '', $img_path = '', $img_url = '', $font_path = '')
@@ -110,7 +110,8 @@ if ( ! function_exists('create_captcha'))
$current_dir = @opendir($img_path);
while ($filename = @readdir($current_dir))
{
if (substr($filename, -4) === '.jpg' && (str_replace('.jpg', '', $filename) + $expiration) < $now)
if (in_array(substr($filename, -4), array('.jpg', '.png'))
&& (str_replace(array('.jpg', '.png'), '', $filename) + $expiration) < $now)
{
@unlink($img_path.$filename);
}
@@ -332,7 +333,7 @@ if ( ! function_exists('create_captcha'))
return FALSE;
}
$img = '<img '.($img_id === '' ? '' : 'id="'.$img_id.'"').' src="'.$img_url.$img_filename.'" style="width: '.$img_width.'; height: '.$img_height .'; border: 0;" alt=" " />';
$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);
return array('word' => $word, 'time' => $now, 'image' => $img, 'filename' => $img_filename);