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

[Visitor] Hopefully fixes incorrect logs loading

浏览代码 
Maybe Fixes #1530
这个提交包含在：
Peter Goodhall 2022-07-10 11:27:08 +01:00
父节点 bf5201e317
当前提交 0fd2894193
共有 1 个文件被更改，包括 19 次插入 和 13 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

32
application/controllers/Visitor.php
查看文件

@ -56,13 +56,9 @@ class Visitor extends CI_Controller {
$logbook_id = $this->logbooks_model->public_slug_exists_logbook_id($public_slug); $logbook_id = $this->logbooks_model->public_slug_exists_logbook_id($public_slug);
if($logbook_id != false) if($logbook_id != false)
{ {
print_r($logbook_id);
// Get associated station locations for mysql queries // Get associated station locations for mysql queries
$logbooks_locations_array = $this->logbooks_model->list_logbook_relationships($logbook_id); $logbooks_locations_array = $this->logbooks_model->list_logbook_relationships($logbook_id);
print_r($logbooks_locations_array);
if (!$logbooks_locations_array) { if (!$logbooks_locations_array) {
show_404('Empty Logbook'); show_404('Empty Logbook');
} }
@ -138,10 +134,15 @@ class Visitor extends CI_Controller {
$slug = $this->security->xss_clean($this->uri->segment(3)); $slug = $this->security->xss_clean($this->uri->segment(3));
$this->load->model('logbooks_model'); $this->load->model('logbooks_model');
if($logbook_id = $this->logbooks_model->public_slug_exists_logbook_id($slug) != false) $logbook_id = $this->logbooks_model->public_slug_exists_logbook_id($slug);
if($logbook_id != false)
{ {
// Get associated station locations for mysql queries // Get associated station locations for mysql queries
$logbooks_locations_array = $this->logbooks_model->list_logbook_relationships($logbook_id); $logbooks_locations_array = $this->logbooks_model->list_logbook_relationships($logbook_id);
if (!$logbooks_locations_array) {
show_404('Empty Logbook');
}
} else { } else {
log_message('error', $slug.' has no associated station locations'); log_message('error', $slug.' has no associated station locations');
show_404('Unknown Public Page.'); show_404('Unknown Public Page.');
@ -236,14 +237,19 @@ class Visitor extends CI_Controller {
$this->load->model('logbooks_model'); $this->load->model('logbooks_model');
if($this->logbooks_model->public_slug_exists($slug)) { if($this->logbooks_model->public_slug_exists($slug)) {
// Load the public view // Load the public view
if($logbook_id = $this->logbooks_model->public_slug_exists_logbook_id($slug) != false) $logbook_id = $this->logbooks_model->public_slug_exists_logbook_id($slug);
{ if($logbook_id != false)
// Get associated station locations for mysql queries {
$logbooks_locations_array = $this->logbooks_model->list_logbook_relationships($logbook_id); // Get associated station locations for mysql queries
} else { $logbooks_locations_array = $this->logbooks_model->list_logbook_relationships($logbook_id);
log_message('error', $slug.' has no associated station locations');
show_404('Unknown Public Page.'); if (!$logbooks_locations_array) {
} show_404('Empty Logbook');
}
} else {
log_message('error', $slug.' has no associated station locations');
show_404('Unknown Public Page.');
}
} }
$this->load->model('gridsquares_model'); $this->load->model('gridsquares_model');