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

Fix confirmed activated grids function

浏览代码
这个提交包含在：
phl0 2023-05-25 23:17:41 +02:00
父节点 2839c6725f
当前提交 0f47f0e73a
找不到此签名对应的密钥
GPG 密钥 ID: 48EA1E640798CA9A
共有 1 个文件被更改，包括 35 次插入 和 45 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

80
application/controllers/Activated_grids.php
查看文件

@ -1,9 +1,9 @@
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); <?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/* /*
Activated_grids Controller Activated_grids Controller
*/ */
class Activated_grids extends CI_Controller { class Activated_grids extends CI_Controller {
@ -86,21 +86,19 @@ class Activated_grids extends CI_Controller {
if ($this->config->item('map_6digit_grids')) { if ($this->config->item('map_6digit_grids')) {
$grid_six = strtoupper(substr($subsquare,0,6)); $grid_six = strtoupper(substr($subsquare,0,6));
} }
// Check if 2 Char is in array // Check if 2 Char is in array
if(!in_array($grid_two, $array_grid_2char)){ if(!in_array($grid_two, $array_confirmed_grid_2char)){
array_push($array_grid_2char, $grid_two); array_push($array_confirmed_grid_2char, $grid_two);
} }
if(!in_array($grid_four, $array_confirmed_grid_4char)){
if(!in_array($grid_four, $array_grid_4char)){ array_push($array_confirmed_grid_4char, $grid_four);
array_push($array_grid_4char, $grid_four);
} }
if ($this->config->item('map_6digit_grids')) { if ($this->config->item('map_6digit_grids')) {
if(!in_array($grid_six, $array_grid_6char)){ if(!in_array($grid_six, $array_confirmed_grid_6char)){
array_push($array_grid_6char, $grid_six); array_push($array_confirmed_grid_6char, $grid_six);
} }
} }
} }
@ -112,21 +110,19 @@ class Activated_grids extends CI_Controller {
if ($this->config->item('map_6digit_grids')) { if ($this->config->item('map_6digit_grids')) {
$grid_6char_confirmed = strtoupper(substr($row->SAT_SQUARE,0,6)); $grid_6char_confirmed = strtoupper(substr($row->SAT_SQUARE,0,6));
} }
// Check if 2 Char is in array // Check if 2 Char is in array
if(!in_array($grid_2char_confirmed, $array_confirmed_grid_2char)){ if(!in_array($grid_2char_confirmed, $array_confirmed_grid_2char)){
array_push($array_confirmed_grid_2char, $grid_2char_confirmed); array_push($array_confirmed_grid_2char, $grid_2char_confirmed);
} }
if(!in_array($grid_4char_confirmed, $array_confirmed_grid_4char)){ if(!in_array($grid_4char_confirmed, $array_confirmed_grid_4char)){
array_push($array_confirmed_grid_4char, $grid_4char_confirmed); array_push($array_confirmed_grid_4char, $grid_4char_confirmed);
} }
if ($this->config->item('map_6digit_grids')) { if ($this->config->item('map_6digit_grids')) {
if(!in_array($grid_6char_confirmed, $array_confirmed_grid_6char)){ if(!in_array($grid_6char_confirmed, $array_confirmed_grid_6char)){
array_push($array_confirmed_grid_6char, $grid_6char_confirmed); array_push($array_confirmed_grid_6char, $grid_6char_confirmed);
} }
} }
@ -153,21 +149,19 @@ class Activated_grids extends CI_Controller {
if ($this->config->item('map_6digit_grids')) { if ($this->config->item('map_6digit_grids')) {
$grid_six = strtoupper(substr($subsquare,0,6)); $grid_six = strtoupper(substr($subsquare,0,6));
} }
// Check if 2 Char is in array // Check if 2 Char is in array
if(!in_array($grid_two, $array_grid_2char)){ if(!in_array($grid_two, $array_grid_2char)){
array_push($array_grid_2char, $grid_two); array_push($array_grid_2char, $grid_two);
} }
if(!in_array($grid_four, $array_grid_4char)){ if(!in_array($grid_four, $array_grid_4char)){
array_push($array_grid_4char, $grid_four); array_push($array_grid_4char, $grid_four);
} }
if ($this->config->item('map_6digit_grids')) { if ($this->config->item('map_6digit_grids')) {
if(!in_array($grid_six, $array_grid_6char)){ if(!in_array($grid_six, $array_grid_6char)){
array_push($array_grid_6char, $grid_six); array_push($array_grid_6char, $grid_six);
} }
} }
} }
@ -179,21 +173,19 @@ class Activated_grids extends CI_Controller {
if ($this->config->item('map_6digit_grids')) { if ($this->config->item('map_6digit_grids')) {
$grid_six = strtoupper(substr($row->SAT_SQUARE,0,6)); $grid_six = strtoupper(substr($row->SAT_SQUARE,0,6));
} }
// Check if 2 Char is in array // Check if 2 Char is in array
if(!in_array($grid_two, $array_grid_2char)){ if(!in_array($grid_two, $array_grid_2char)){
array_push($array_grid_2char, $grid_two); array_push($array_grid_2char, $grid_two);
} }
if(!in_array($grid_four, $array_grid_4char)){ if(!in_array($grid_four, $array_grid_4char)){
array_push($array_grid_4char, $grid_four); array_push($array_grid_4char, $grid_four);
} }
if ($this->config->item('map_6digit_grids')) { if ($this->config->item('map_6digit_grids')) {
if(!in_array($grid_six, $array_grid_6char)){ if(!in_array($grid_six, $array_grid_6char)){
array_push($array_grid_6char, $grid_six); array_push($array_grid_6char, $grid_six);
} }
} }
@ -214,7 +206,6 @@ class Activated_grids extends CI_Controller {
return '[' . implode(',', $temp) . ']'; return '[' . implode(',', $temp) . ']';
} }
$data['grid_2char_confirmed'] = js_array($array_confirmed_grid_2char); $data['grid_2char_confirmed'] = js_array($array_confirmed_grid_2char);
$data['grid_4char_confirmed'] = js_array($array_confirmed_grid_4char); $data['grid_4char_confirmed'] = js_array($array_confirmed_grid_4char);
$data['grid_6char_confirmed'] = js_array($array_confirmed_grid_6char); $data['grid_6char_confirmed'] = js_array($array_confirmed_grid_6char);
@ -228,7 +219,6 @@ class Activated_grids extends CI_Controller {
$this->load->view('activated_grids/index.php'); $this->load->view('activated_grids/index.php');
$this->load->view('interface_assets/footer'); $this->load->view('interface_assets/footer');
} }
public function band($band) public function band($band)
{ {
@ -266,16 +256,16 @@ class Activated_grids extends CI_Controller {
// Check if 2 Char is in array // Check if 2 Char is in array
if(!in_array($grid_2char_confirmed, $array_grid_2char_confirmed)){ if(!in_array($grid_2char_confirmed, $array_grid_2char_confirmed)){
array_push($array_grid_2char_confirmed, $grid_2char_confirmed); array_push($array_grid_2char_confirmed, $grid_2char_confirmed);
} }
if(!in_array($grid_4char_confirmed, $array_grid_4char_confirmed)){ if(!in_array($grid_4char_confirmed, $array_grid_4char_confirmed)){
array_push($array_grid_4char_confirmed, $grid_4char_confirmed); array_push($array_grid_4char_confirmed, $grid_4char_confirmed);
} }
if ($this->config->item('map_6digit_grids')) { if ($this->config->item('map_6digit_grids')) {
if(!in_array($grid_6char_confirmed, $array_grid_6char_confirmed)){ if(!in_array($grid_6char_confirmed, $array_grid_6char_confirmed)){
array_push($array_grid_6char_confirmed, $grid_6char_confirmed); array_push($array_grid_6char_confirmed, $grid_6char_confirmed);
} }
} }
} }
@ -296,18 +286,18 @@ class Activated_grids extends CI_Controller {
// Check if 2 Char is in array // Check if 2 Char is in array
if(!in_array($grid_two, $array_grid_2char)){ if(!in_array($grid_two, $array_grid_2char)){
array_push($array_grid_2char, $grid_two); array_push($array_grid_2char, $grid_two);
} }
if(!in_array($grid_four, $array_grid_4char)){ if(!in_array($grid_four, $array_grid_4char)){
array_push($array_grid_4char, $grid_four); array_push($array_grid_4char, $grid_four);
} }
if ($this->config->item('map_6digit_grids')) { if ($this->config->item('map_6digit_grids')) {
if(!in_array($grid_six, $array_grid_6char)){ if(!in_array($grid_six, $array_grid_6char)){
array_push($array_grid_6char, $grid_six); array_push($array_grid_6char, $grid_six);
} }
} }