Fix PHP 8.x compatibility issues across the codebase
Co-authored-by: magicbug <84308+magicbug@users.noreply.github.com>
这个提交包含在:
父节点
02b11de709
当前提交
759c7b31f2
共有 3 个文件被更改,包括 19 次插入 和 8 次删除
|
|
@ -107,8 +107,8 @@
|
|||
?>
|
||||
<td><span data-bs-toggle="tooltip" title="<?php if ($rove['mhz'] != '') {
|
||||
printf("%.3f", $rove['mhz']);
|
||||
echo " " . $direction ?? '';
|
||||
} ?>"><?= $rove['satellite']['name'] ?></span></td>
|
||||
echo " " . ($direction ?? '');
|
||||
} ?>"><?php echo $rove['satellite']['name']; ?></span></td>
|
||||
<td><span title="<?php echo $rove['mode']; ?>" class="badge <?php echo $modeclass; ?>"><?php echo $rove['mode']; ?></span></td>
|
||||
<td>
|
||||
|
||||
|
|
|
|||
|
|
@ -21,8 +21,8 @@ if (!isset($options->operator)) {
|
|||
?>
|
||||
</script>
|
||||
<script>
|
||||
const CSRF_NAME = '<?= $this->security->get_csrf_token_name(); ?>';
|
||||
const CSRF_HASH = '<?= $this->security->get_csrf_hash(); ?>';
|
||||
const CSRF_NAME = '<?php echo $this->security->get_csrf_token_name(); ?>';
|
||||
const CSRF_HASH = '<?php echo $this->security->get_csrf_hash(); ?>';
|
||||
</script>
|
||||
<style>
|
||||
/*Legend specific*/
|
||||
|
|
|
|||
|
|
@ -152,7 +152,7 @@ class CI_Encryption {
|
|||
public function __construct(array $params = array())
|
||||
{
|
||||
$this->_drivers = array(
|
||||
'mcrypt' => defined('MCRYPT_DEV_URANDOM'),
|
||||
'mcrypt' => defined('MCRYPT_DEV_URANDOM') && function_exists('mcrypt_encrypt'),
|
||||
'openssl' => extension_loaded('openssl')
|
||||
);
|
||||
|
||||
|
|
@ -203,9 +203,20 @@ class CI_Encryption {
|
|||
|
||||
if (empty($this->_driver))
|
||||
{
|
||||
$this->_driver = ($this->_drivers['openssl'] === TRUE)
|
||||
? 'openssl'
|
||||
: 'mcrypt';
|
||||
// Prefer OpenSSL on modern PHP versions where mcrypt is not available
|
||||
if ($this->_drivers['openssl'] === TRUE)
|
||||
{
|
||||
$this->_driver = 'openssl';
|
||||
}
|
||||
elseif ($this->_drivers['mcrypt'] === TRUE)
|
||||
{
|
||||
$this->_driver = 'mcrypt';
|
||||
}
|
||||
else
|
||||
{
|
||||
// This shouldn't happen as we check both drivers in constructor
|
||||
show_error('Encryption: No available encryption driver found.');
|
||||
}
|
||||
|
||||
log_message('debug', "Encryption: Auto-configured driver '".$this->_driver."'.");
|
||||
}
|
||||
|
|
|
|||
正在加载…
在新工单中引用