goodspeed/Cloudlog
1
0
派生 0
代码 工单 合并请求 项目 版本发布 软件包 百科 动态 Actions

[PHP8] Fixes for some errors that PHP8 puts out. Fixes #882

浏览代码
这个提交包含在：
Andreas 2021-07-20 15:07:55 +02:00
父节点 d118c5fef5
当前提交 4e5144066e
共有 2 个文件被更改，包括 23 次插入 和 19 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

28
application/models/Options_model.php
查看文件

@ -2,7 +2,7 @@
/* /*
Class: Options_model Class: Options_model
This model handles all database interactions for the options table This model handles all database interactions for the options table
used for global settings within cloudlog. used for global settings within cloudlog.
*/ */
@ -12,7 +12,7 @@ class Options_model extends CI_Model {
{ {
parent::__construct(); parent::__construct();
} }
// Returns all options that are autoload yes // Returns all options that are autoload yes
function get_autoloads() { function get_autoloads() {
$this->db->where('autoload', "yes"); $this->db->where('autoload', "yes");
@ -25,7 +25,11 @@ class Options_model extends CI_Model {
$query = $this->db->get('options'); $query = $this->db->get('options');
$row = $query->row(); $row = $query->row();
return $row->option_value; if (isset($row->option_value)) {
return $row->option_value;
}
return null;
} }
/* /*
@ -50,7 +54,7 @@ class Options_model extends CI_Model {
'option_value' => $option_value, 'option_value' => $option_value,
'autoload' => $autoload, 'autoload' => $autoload,
); );
// Save to database // Save to database
$this->db->insert('options', $data); $this->db->insert('options', $data);
@ -70,25 +74,25 @@ class Options_model extends CI_Model {
$this->db->where('option_name', $option_name); $this->db->where('option_name', $option_name);
$query = $this->db->get('options'); $query = $this->db->get('options');
$data = array(
'option_name' => $option_name,
'option_value' => $option_value,
);
if($query->num_rows() > 0) { if($query->num_rows() > 0) {
// Update the Entry // Update the Entry
$data = array(
'option_name' => $option_name,
'option_value' => $option_value,
);
$this->db->where('option_name', $option_name); $this->db->where('option_name', $option_name);
$this->db->update('options', $data); $this->db->update('options', $data);
return TRUE; return TRUE;
} else { } else {
// Save to database // Save to database
$this->db->insert('options', $data); $this->db->insert('options', $data);
return FALSE; return FALSE;
} }
} }
} }
?> ?>

14
application/models/User_model.php
查看文件

@ -276,13 +276,13 @@ class User_Model extends CI_Model {
'user_measurement_base' => $u->row()->user_measurement_base, 'user_measurement_base' => $u->row()->user_measurement_base,
'user_date_format' => $u->row()->user_date_format, 'user_date_format' => $u->row()->user_date_format,
'user_stylesheet' => $u->row()->user_stylesheet, 'user_stylesheet' => $u->row()->user_stylesheet,
'user_sota_lookup' => $u->row()->user_sota_lookup, 'user_sota_lookup' => isset($u->row()->user_sota_lookup) ? $u->row()->user_sota_lookup : 0,
'user_show_notes' => $u->row()->user_show_notes, 'user_show_notes' => isset($u->row()->user_show_notes) ? $u->row()->user_show_notes : 1,
'user_column1' => $u->row()->user_column1, 'user_column1' => isset($u->row()->user_column1) ? $u->row()->user_column1: 'Mode',
'user_column2' => $u->row()->user_column2, 'user_column2' => isset($u->row()->user_column2) ? $u->row()->user_column2: 'RSTS',
'user_column3' => $u->row()->user_column3, 'user_column3' => isset($u->row()->user_column3) ? $u->row()->user_column3: 'RSTR',
'user_column4' => $u->row()->user_column4, 'user_column4' => isset($u->row()->user_column4) ? $u->row()->user_column4: 'Band',
'user_column5' => $u->row()->user_column5, 'user_column5' => isset($u->row()->user_column5) ? $u->row()->user_column5: 'Country',
); );
$this->session->set_userdata($userdata); $this->session->set_userdata($userdata);