Merge 03e9c1a99eea56ceed39f0fcea38955a6716570e into 6d2313d3a26269e4d49084bbd038855bd74a2309

This commit is contained in:
k4bek4be 2023-11-01 06:24:43 -06:00 committed by GitHub
commit e07c9b3c4c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 23 additions and 18 deletions

View File

@ -350,7 +350,7 @@ if (!function_exists('display_captcha')) {
$rad1 = $radius * (($i + 1) / $points);
$x1 = ($rad1 * cos($theta)) + $x_axis;
$y1 = ($rad1 * sin($theta)) + $y_axis;
imageline($im, $x, $y, $x1, $y1, $grid_color);
imageline($im, (int)$x, (int)$y, (int)$x1, (int)$y1, $grid_color);
$theta = $theta - $thetac;
}
@ -368,11 +368,11 @@ if (!function_exists('display_captcha')) {
if ($use_font == false) {
$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 = 16;
$x = mt_rand(0, $img_width / ($length / 1.5));
$x = mt_rand(0, (int)($img_width / ($length / 1.5)));
$y = $font_size + 2;
}
for ($i = 0; $i < strlen($word); $i++) {

View File

@ -461,7 +461,7 @@ class Carabiner {
* @param String of the group name with which the asset is to be associated. NOT REQUIRED
* @return Void
*/
private function _asset($type, $dev_file, $prod_file = '', $combine, $minify, $media = 'screen', $group = 'main')
private function _asset($type, $dev_file, $prod_file = '', $combine = TRUE, $minify = TRUE, $media = 'screen', $group = 'main')
{
if ($type == 'css') :
@ -938,14 +938,16 @@ class Carabiner {
private function _get_contents($ref)
{
$contents = false;
if( $this->isURL($ref) && ( ini_get('allow_url_fopen') == 0 || $this->force_curl ) ):
$this->_load('curl');
$contents = $this->CI->curl->simple_get($ref);
else:
if($ref){
$contents = file_get_contents( $ref );
}
endif;

View File

@ -174,7 +174,7 @@ class JSMin {
}
protected function isAlphaNum($c) {
return ord($c) > 126 || $c === '\\' || preg_match('/^[\w\$]$/', $c) === 1;
return $c ? ord($c) > 126 || $c === '\\' || preg_match('/^[\w\$]$/', $c) === 1 : false;
}
protected function min() {

View File

@ -565,7 +565,7 @@ class CI_Input {
$which = FILTER_FLAG_IPV6;
break;
default:
$which = NULL;
$which = FILTER_DEFAULT;
break;
}

View File

@ -454,7 +454,7 @@ class CI_Output {
if ($this->parse_exec_vars === TRUE)
{
$memory = round(memory_get_usage() / 1024 / 1024, 2).'MB';
$output = str_replace(array('{elapsed_time}', '{memory_usage}'), array($elapsed, $memory), $output);
$output = $output ? str_replace(array('{elapsed_time}', '{memory_usage}'), array($elapsed, $memory), $output) : '';
}
// --------------------------------------------------------------------

View File

@ -522,7 +522,7 @@ class CI_Pagination {
}
// If something isn't quite right, back to the default base page.
if ( ! ctype_digit($this->cur_page) OR ($this->use_page_numbers && (int) $this->cur_page === 0))
if ( ! ctype_digit(strval($this->cur_page)) OR ($this->use_page_numbers && (int) $this->cur_page === 0))
{
$this->cur_page = $base_page;
}

View File

@ -126,7 +126,7 @@ class CI_Session_database_driver extends CI_Session_driver implements SessionHan
* @param string $name Session cookie name, unused
* @return bool
*/
public function open($save_path, $name)
public function open(string $path, string $name): bool
{
if (empty($this->_db->conn_id) && ! $this->_db->db_connect())
{
@ -148,7 +148,7 @@ class CI_Session_database_driver extends CI_Session_driver implements SessionHan
* @param string $session_id Session ID
* @return string Serialized session data
*/
public function read($session_id)
public function read($session_id): string|false
{
if ($this->_get_lock($session_id) !== FALSE)
{
@ -205,7 +205,7 @@ class CI_Session_database_driver extends CI_Session_driver implements SessionHan
* @param string $session_data Serialized session data
* @return bool
*/
public function write($session_id, $session_data)
public function write($session_id, $session_data): bool
{
// Prevent previous QB calls from messing with our queries
$this->_db->reset_query();
@ -277,7 +277,7 @@ class CI_Session_database_driver extends CI_Session_driver implements SessionHan
*
* @return bool
*/
public function close()
public function close() : bool
{
return ($this->_lock && ! $this->_release_lock())
? $this->_fail()
@ -294,7 +294,7 @@ class CI_Session_database_driver extends CI_Session_driver implements SessionHan
* @param string $session_id Session ID
* @return bool
*/
public function destroy($session_id)
public function destroy($session_id) : bool
{
if ($this->_lock)
{
@ -332,7 +332,7 @@ class CI_Session_database_driver extends CI_Session_driver implements SessionHan
* @param int $maxlifetime Maximum lifetime of sessions
* @return bool
*/
public function gc($maxlifetime)
public function gc(int $max_lifetime): int|false
{
// Prevent previous QB calls from messing with our queries
$this->_db->reset_query();

View File

@ -3,7 +3,10 @@
<div class="item">
<label for="search"><?php echo lang('paste_search'); ?>
</label>
<input type="text" name="search" value="<?php echo str_replace('"', '&quot;', $this->input->get('search')); ?>" id="search" maxlength="100" tabindex="1" />
<input type="text" name="search" value="<?php
$search = $this->input->get('search');
echo $search ? str_replace('"', '&quot;', $search) : '';
?>" id="search" maxlength="100" tabindex="1" />
</div>
</div>
</form>