mirror of
https://github.com/wavelog/wavelog.git
synced 2026-03-22 10:24:14 +00:00
Do a 2nd lookup for TLE in case SAT is not found with name
This commit is contained in:
@@ -384,12 +384,12 @@ class Satellite extends CI_Controller {
|
||||
foreach ($satellites as $sat) { // Loop through known SATs
|
||||
if ( (count($input_sat) > 0) && !((count($input_sat) == 1) && (($input_sat[0] ?? '') == '')) ) { // User wants specific SATs (which isn't "All" or empty)??
|
||||
if (in_array($sat->satname,$input_sat) || in_array($sat->displayname,$input_sat)) {
|
||||
$tles[]=$this->satellite_model->get_tle($sat->satname);
|
||||
$tles[]=$this->satellite_model->get_tle($sat->satname ? $sat->satname : $sat->displayname);
|
||||
} else {
|
||||
continue;
|
||||
}
|
||||
} else { // No specific SAT, but all
|
||||
$tles[]=$this->satellite_model->get_tle($sat->satname);
|
||||
$tles[]=$this->satellite_model->get_tle($sat->satname ? $sat->satname : $sat->displayname);
|
||||
}
|
||||
}
|
||||
return $tles;
|
||||
@@ -660,7 +660,7 @@ class Satellite extends CI_Controller {
|
||||
$this->load->model('satellite_model');
|
||||
|
||||
$data['satinfo'] = $this->satellite_model->getsatellite($id)->result();
|
||||
$data['tleinfo'] = $this->satellite_model->get_tle($data['satinfo'][0]->name);
|
||||
$data['tleinfo'] = $this->satellite_model->get_tle($data['satinfo'][0]->name ? $data['satinfo'][0]->name : $data['satinfo'][0]->displayname);
|
||||
|
||||
$this->load->view('satellite/tleinfo', $data);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user