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

replaced 0 with Ø in callsigns

浏览代码
这个提交包含在：
Kim Huebel 2019-06-25 15:28:59 +02:00
父节点 13c225cf71
当前提交 4d30dc426e
共有 8 个文件被更改，包括 15 次插入 和 15 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

12
application/controllers/Eqsl.php
查看文件

@ -53,13 +53,13 @@ class eqsl extends CI_Controller {
$record['qsl_sent'] = $config['eqsl_rcvd_mark']; $record['qsl_sent'] = $config['eqsl_rcvd_mark'];
} }
$status = $this->logbook_model->import_check($time_on, $record['call'], $record['band']); $status = $this->logbook_model->import_check($time_on, str_replace("0","Ø",$record['call']), $record['band']);
if ($status == "Found") if ($status == "Found")
{ {
$dupe = $this->logbook_model->eqsl_dupe_check($time_on, $record['call'], $record['band'], $config['eqsl_rcvd_mark']); $dupe = $this->logbook_model->eqsl_dupe_check($time_on, str_replace("0","Ø",$record['call']), $record['band'], $config['eqsl_rcvd_mark']);
if ($dupe == false) if ($dupe == false)
{ {
$eqsl_status = $this->logbook_model->eqsl_update($time_on, $record['call'], $record['band'], $config['eqsl_rcvd_mark']); $eqsl_status = $this->logbook_model->eqsl_update($time_on, str_replace("0","Ø",$record['call']), $record['band'], $config['eqsl_rcvd_mark']);
} }
else else
{ {
@ -72,7 +72,7 @@ class eqsl extends CI_Controller {
} }
$table .= "<tr>"; $table .= "<tr>";
$table .= "<td>".$time_on."</td>"; $table .= "<td>".$time_on."</td>";
$table .= "<td>".$record['call']."</td>"; $table .= "<td>".str_replace("0","&Oslash;",$record['call'])."</td>";
$table .= "<td>".$record['mode']."</td>"; $table .= "<td>".$record['mode']."</td>";
$table .= "<td>QSO Record: ".$status."</td>"; $table .= "<td>QSO Record: ".$status."</td>";
$table .= "<td>eQSL Record: ".$eqsl_status."</td>"; $table .= "<td>eQSL Record: ".$eqsl_status."</td>";
@ -485,7 +485,7 @@ class eqsl extends CI_Controller {
} }
$table .= "<tr>"; $table .= "<tr>";
$table .= "<td>".$qsl['COL_TIME_ON']."</td>"; $table .= "<td>".$qsl['COL_TIME_ON']."</td>";
$table .= "<td>".$qsl['COL_CALL']."</td>"; $table .= "<td>".str_replace("0","&Oslash;",$qsl['COL_CALL'])."</td>";
$table .= "<td>".$qsl['COL_MODE']."</td>"; $table .= "<td>".$qsl['COL_MODE']."</td>";
$table .= "<td>".$qsl['COL_BAND']."</td>"; $table .= "<td>".$qsl['COL_BAND']."</td>";
$table .= "<td>".$status."</td>"; $table .= "<td>".$status."</td>";
@ -514,7 +514,7 @@ class eqsl extends CI_Controller {
{ {
$table .= "<tr>"; $table .= "<tr>";
$table .= "<td>".$qsl['COL_TIME_ON']."</td>"; $table .= "<td>".$qsl['COL_TIME_ON']."</td>";
$table .= "<td><a class=\"qsobox\" href=\"".site_url('qso/edit')."/".$qsl['COL_PRIMARY_KEY']."\">".strtoupper($qsl['COL_CALL'])."</a></td>"; $table .= "<td><a class=\"qsobox\" href=\"".site_url('qso/edit')."/".$qsl['COL_PRIMARY_KEY']."\">".str_replace("0","&Oslash;",strtoupper($qsl['COL_CALL']))."</a></td>";
$table .= "<td>".$qsl['COL_MODE']."</td>"; $table .= "<td>".$qsl['COL_MODE']."</td>";
$table .= "<td>".$qsl['COL_BAND']."</td>"; $table .= "<td>".$qsl['COL_BAND']."</td>";
$table .= "<tr>"; $table .= "<tr>";

2
application/controllers/Logbook.php
查看文件

@ -249,7 +249,7 @@ class Logbook extends CI_Controller {
{ {
$html .= "<tr>"; $html .= "<tr>";
$html .= "<td>".$row->COL_TIME_ON."</td>"; $html .= "<td>".$row->COL_TIME_ON."</td>";
$html .= "<td>".$row->COL_CALL."</td>"; $html .= "<td>".str_replace("0","&Oslash;",strtoupper($row->COL_CALL))."</td>";
$html .= "<td>".$row->COL_RST_SENT."</td>"; $html .= "<td>".$row->COL_RST_SENT."</td>";
$html .= "<td>".$row->COL_RST_RCVD."</td>"; $html .= "<td>".$row->COL_RST_RCVD."</td>";
if($row->COL_SAT_NAME != null) { if($row->COL_SAT_NAME != null) {

2
application/views/dashboard/index.php
查看文件

@ -47,7 +47,7 @@
<?php } ?> <?php } ?>
<td> <td>
<a data-fancybox data-type="iframe" data-src="<?php echo site_url('logbook/view')."/".$row->COL_PRIMARY_KEY; ?>" href="javascript:;"> <a data-fancybox data-type="iframe" data-src="<?php echo site_url('logbook/view')."/".$row->COL_PRIMARY_KEY; ?>" href="javascript:;">
<?php echo strtoupper($row->COL_CALL); ?> <?php echo str_replace("0","&Oslash;",strtoupper($row->COL_CALL)); ?>
</a> </a>
</td> </td>
<td><?php echo $row->COL_MODE; ?></td> <td><?php echo $row->COL_MODE; ?></td>

2
application/views/qso/index.php
查看文件

@ -324,7 +324,7 @@
foreach ($query->result() as $row) { ?> foreach ($query->result() as $row) { ?>
<?php echo '<tr class="tr'.($i & 1).'">'; ?> <?php echo '<tr class="tr'.($i & 1).'">'; ?>
<td><?php echo $row->COL_TIME_ON; ?></td> <td><?php echo $row->COL_TIME_ON; ?></td>
<td><a class="qsobox" data-fancybox data-type="iframe" data-src="<?php echo site_url('logbook/view')."/".$row->COL_PRIMARY_KEY; ?>" href="javascript:;"><?php echo strtoupper($row->COL_CALL); ?></a></td> <td><a class="qsobox" data-fancybox data-type="iframe" data-src="<?php echo site_url('logbook/view')."/".$row->COL_PRIMARY_KEY; ?>" href="javascript:;"><?php echo str_replace("0","&Oslash;",strtoupper($row->COL_CALL)); ?></a></td>
<td><?php echo $row->COL_MODE; ?></td> <td><?php echo $row->COL_MODE; ?></td>
<td><?php echo $row->COL_RST_SENT; ?></td> <td><?php echo $row->COL_RST_SENT; ?></td>
<td><?php echo $row->COL_RST_RCVD; ?></td> <td><?php echo $row->COL_RST_RCVD; ?></td>

2
application/views/search/result_search.php
查看文件

@ -33,7 +33,7 @@
<?php echo '<tr class="tr'.($i & 1).'">'; ?> <?php echo '<tr class="tr'.($i & 1).'">'; ?>
<td><?php $timestamp = strtotime($row->COL_TIME_ON); echo date('d/m/y', $timestamp); ?></td> <td><?php $timestamp = strtotime($row->COL_TIME_ON); echo date('d/m/y', $timestamp); ?></td>
<td><?php $timestamp = strtotime($row->COL_TIME_ON); echo date('H:i', $timestamp); ?></td> <td><?php $timestamp = strtotime($row->COL_TIME_ON); echo date('H:i', $timestamp); ?></td>
<td><a class="qsobox" href="<?php echo site_url('logbook/view')."/".$row->COL_PRIMARY_KEY; ?>"><?php echo strtoupper($row->COL_CALL); ?></a></td> <td><a class="qsobox" href="<?php echo site_url('logbook/view')."/".$row->COL_PRIMARY_KEY; ?>"><?php echo str_replace("0","&Oslash;",strtoupper($row->COL_CALL)); ?></a></td>
<td><?php echo $row->COL_MODE; ?></td> <td><?php echo $row->COL_MODE; ?></td>
<td><?php echo $row->COL_RST_SENT; ?> <?php if ($row->COL_STX_STRING) { ?><span class="label"><?php echo $row->COL_STX_STRING;?></span><?php } ?></td> <td><?php echo $row->COL_RST_SENT; ?> <?php if ($row->COL_STX_STRING) { ?><span class="label"><?php echo $row->COL_STX_STRING;?></span><?php } ?></td>
<td><?php echo $row->COL_RST_RCVD; ?> <?php if ($row->COL_SRX_STRING) { ?><span class="label"><?php echo $row->COL_SRX_STRING;?></span><?php } ?></td> <td><?php echo $row->COL_RST_RCVD; ?> <?php if ($row->COL_SRX_STRING) { ?><span class="label"><?php echo $row->COL_SRX_STRING;?></span><?php } ?></td>

2
application/views/view_log/partial/log.php
查看文件

@ -29,7 +29,7 @@
<?php if(($this->config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE || ($this->config->item('show_time'))) { ?> <?php if(($this->config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE || ($this->config->item('show_time'))) { ?>
<td><?php $timestamp = strtotime($row->COL_TIME_ON); echo date('H:i', $timestamp); ?></td> <td><?php $timestamp = strtotime($row->COL_TIME_ON); echo date('H:i', $timestamp); ?></td>
<?php } ?> <?php } ?>
<td><a data-fancybox data-type="iframe" data-src="<?php echo site_url('logbook/view')."/".$row->COL_PRIMARY_KEY; ?>" href="javascript:;"><?php echo strtoupper($row->COL_CALL); ?></a></td> <td><a data-fancybox data-type="iframe" data-src="<?php echo site_url('logbook/view')."/".$row->COL_PRIMARY_KEY; ?>" href="javascript:;"><?php echo str_replace("0","&Oslash;",strtoupper($row->COL_CALL)); ?></a></td>
<td><?php echo $row->COL_MODE; ?></td> <td><?php echo $row->COL_MODE; ?></td>
<td><?php echo $row->COL_RST_SENT; ?> <?php if ($row->COL_STX_STRING) { ?><span class="label"><?php echo $row->COL_STX_STRING;?></span><?php } ?></td> <td><?php echo $row->COL_RST_SENT; ?> <?php if ($row->COL_STX_STRING) { ?><span class="label"><?php echo $row->COL_STX_STRING;?></span><?php } ?></td>
<td><?php echo $row->COL_RST_RCVD; ?> <?php if ($row->COL_SRX_STRING) { ?><span class="label"><?php echo $row->COL_SRX_STRING;?></span><?php } ?></td> <td><?php echo $row->COL_RST_RCVD; ?> <?php if ($row->COL_SRX_STRING) { ?><span class="label"><?php echo $row->COL_SRX_STRING;?></span><?php } ?></td>

6
application/views/view_log/qso.php
查看文件

@ -2,9 +2,9 @@
<?php if ($query->num_rows() > 0) { foreach ($query->result() as $row) { <?php if ($query->num_rows() > 0) { foreach ($query->result() as $row) {
?> ?>
<?php if(($this->config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE || ($this->config->item('show_time'))) { ?> <?php if(($this->config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE || ($this->config->item('show_time'))) { ?>
<h4>QSO with <?php echo $row->COL_CALL; ?> on the <?php $timestamp = strtotime($row->COL_TIME_ON); echo date('d/m/y', $timestamp); $timestamp = strtotime($row->COL_TIME_ON); echo " at ".date('H:i', $timestamp); ?></h4> <h4>QSO with <?php echo str_replace("0","&Oslash;",strtoupper($row->COL_CALL)); ?> on the <?php $timestamp = strtotime($row->COL_TIME_ON); echo date('d/m/y', $timestamp); $timestamp = strtotime($row->COL_TIME_ON); echo " at ".date('H:i', $timestamp); ?></h4>
<?php } else { ?> <?php } else { ?>
<h4>QSO with <?php echo $row->COL_CALL; ?> on the <?php $timestamp = strtotime($row->COL_TIME_ON); echo date('d/m/y', $timestamp);?></h4> <h4>QSO with <?php echo str_replace("0","&Oslash;",strtoupper($row->COL_CALL)); ?> on the <?php $timestamp = strtotime($row->COL_TIME_ON); echo date('d/m/y', $timestamp);?></h4>
<?php } ?> <?php } ?>
<div class="row"> <div class="row">
@ -22,7 +22,7 @@
<tr> <tr>
<td>Callsign:</td> <td>Callsign:</td>
<td><?php echo $row->COL_CALL; ?></td> <td><?php echo str_replace("0","&Oslash;",strtoupper($row->COL_CALL)); ?></td>
</tr> </tr>
<tr> <tr>

2
application/views/widgets/qsos.php
查看文件

@ -28,7 +28,7 @@
<?php echo '<tr class="tr'.($i & 1).'">'; ?> <?php echo '<tr class="tr'.($i & 1).'">'; ?>
<td><?php $timestamp = strtotime($row->COL_TIME_ON); echo date('d/m/y', $timestamp); ?></td> <td><?php $timestamp = strtotime($row->COL_TIME_ON); echo date('d/m/y', $timestamp); ?></td>
<td><?php $timestamp = strtotime($row->COL_TIME_ON); echo date('H:i', $timestamp); ?></td> <td><?php $timestamp = strtotime($row->COL_TIME_ON); echo date('H:i', $timestamp); ?></td>
<td><a class="qsobox" href="<?php echo site_url('logbook/view')."/".$row->COL_PRIMARY_KEY; ?>"><?php echo strtoupper($row->COL_CALL); ?></a></td> <td><a class="qsobox" href="<?php echo site_url('logbook/view')."/".$row->COL_PRIMARY_KEY; ?>"><?php echo str_replace("0","&Oslash;",strtoupper($row->COL_CALL)); ?></a></td>
<td><?php echo $row->COL_MODE; ?></td> <td><?php echo $row->COL_MODE; ?></td>
<td><?php echo $row->COL_RST_SENT; ?> <?php if ($row->COL_STX_STRING) { ?>(<?php echo $row->COL_STX_STRING;?>)<?php } ?></td> <td><?php echo $row->COL_RST_SENT; ?> <?php if ($row->COL_STX_STRING) { ?>(<?php echo $row->COL_STX_STRING;?>)<?php } ?></td>
<td><?php echo $row->COL_RST_RCVD; ?> <?php if ($row->COL_SRX_STRING) { ?>(<?php echo $row->COL_SRX_STRING;?>)<?php } ?></td> <td><?php echo $row->COL_RST_RCVD; ?> <?php if ($row->COL_SRX_STRING) { ?>(<?php echo $row->COL_SRX_STRING;?>)<?php } ?></td>