Skip to content

Commit 0eca970

Browse files
phl0phl0
authored
Merge pull request wavelog#281 from wavelog/dev
Release 1.5.1
2 parents 4f2deb4 + 607dc16 commit 0eca970

File tree

4 files changed

+52
-16
lines changed

4 files changed

+52
-16
lines changed

‎application/config/migration.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
|
2323
*/
2424

25-
$config['migration_version'] = 192;
25+
$config['migration_version'] = 193;
2626

2727
/*
2828
|--------------------------------------------------------------------------

‎application/migrations/193_tag_1_5_1.php‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<?php
2+
3+
defined('BASEPATH') OR exit('No direct script access allowed');
4+
5+
/*
6+
Tag Wavelog as Version 1.5
7+
*/
8+
9+
class Migration_tag_1_5_1 extends CI_Migration {
10+
11+
public function up()
12+
{
13+
14+
// Tag Wavelog New Version
15+
$this->db->where('option_name', 'version');
16+
$this->db->update('options', array('option_value' => '1.5.1'));
17+
18+
// Trigger Version Info Dialog
19+
$this->db->where('option_type', 'version_dialog');
20+
$this->db->where('option_name', 'confirmed');
21+
$this->db->update('user_options', array('option_value' => 'false'));
22+
23+
// Also set Version Dialog to "both" if only custom text is applied
24+
$this->db->where('option_name', 'version_dialog');
25+
$this->db->where('option_value', 'custom_text');
26+
$this->db->update('options', array('option_value' => 'both'));
27+
28+
29+
}
30+
31+
public function down()
32+
{
33+
$this->db->where('option_name', 'version');
34+
$this->db->update('options', array('option_value' => '1.5'));
35+
}
36+
}

‎application/views/dashboard/index.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -250,13 +250,13 @@ function echo_table_col($row, $name) {
250250
<tr>
251251
<td width="50%"><?php echo lang('general_word_sent'); ?></td>
252252
<td width="25%"><?php echo $total_qsl_sent; ?></td>
253-
<td width="25%"><a href="javascript:displayContacts('','All','All','QSLSDATE','');"><?php echo $qsl_sent_today; ?></a></td>
253+
<td width="25%"><a href="javascript:displayContacts('','All','All','All','All','QSLSDATE','');"><?php echo $qsl_sent_today; ?></a></td>
254254
</tr>
255255

256256
<tr>
257257
<td width="50%"><?php echo lang('general_word_received'); ?></td>
258258
<td width="25%"><?php echo $total_qsl_rcvd; ?></td>
259-
<td width="25%"><a href="javascript:displayContacts('','All','All','QSLRDATE','');"><?php echo $qsl_rcvd_today; ?></a></td>
259+
<td width="25%"><a href="javascript:displayContacts('','All','All','All','All','QSLRDATE','');"><?php echo $qsl_rcvd_today; ?></a></td>
260260
</tr>
261261

262262
<tr>
@@ -277,13 +277,13 @@ function echo_table_col($row, $name) {
277277
<tr>
278278
<td width="50%"><?php echo lang('general_word_sent'); ?></td>
279279
<td width="25%"><?php echo $total_lotw_sent; ?></td>
280-
<td width="25%"><a href="javascript:displayContacts('','all','all','LOTWSDATE','');"><?php echo $lotw_sent_today; ?></a></td>
280+
<td width="25%"><a href="javascript:displayContacts('','all','all','All','All','LOTWSDATE','');"><?php echo $lotw_sent_today; ?></a></td>
281281
</tr>
282282

283283
<tr>
284284
<td width="50%"><?php echo lang('general_word_received'); ?></td>
285285
<td width="25%"><?php echo $total_lotw_rcvd; ?></td>
286-
<td width="25%"><a href="javascript:displayContacts('','all','all','LOTWRDATE','');"><?php echo $lotw_rcvd_today; ?></a></td>
286+
<td width="25%"><a href="javascript:displayContacts('','all','all','All','All','LOTWRDATE','');"><?php echo $lotw_rcvd_today; ?></a></td>
287287
</tr>
288288
</table>
289289
<?php } ?>
@@ -298,13 +298,13 @@ function echo_table_col($row, $name) {
298298
<tr>
299299
<td width="50%"><?php echo lang('general_word_sent'); ?></td>
300300
<td width="25%"><?php echo $total_eqsl_sent; ?></td>
301-
<td width="25%"><a href="javascript:displayContacts('','All','All','EQSLSDATE','');"><?php echo $eqsl_sent_today; ?></a></td>
301+
<td width="25%"><a href="javascript:displayContacts('','All','All','All','All','EQSLSDATE','');"><?php echo $eqsl_sent_today; ?></a></td>
302302
</tr>
303303

304304
<tr>
305305
<td width="50%"><?php echo lang('general_word_received'); ?></td>
306306
<td width="25%"><?php echo $total_eqsl_rcvd; ?></td>
307-
<td width="25%"><a href="javascript:displayContacts('','All','All','EQSLRDATE','');"><?php echo $eqsl_rcvd_today; ?></a></td>
307+
<td width="25%"><a href="javascript:displayContacts('','All','All','All','All','EQSLRDATE','');"><?php echo $eqsl_rcvd_today; ?></a></td>
308308
</tr>
309309
</table>
310310
<?php } ?>
@@ -319,13 +319,13 @@ function echo_table_col($row, $name) {
319319
<tr>
320320
<td width="50%"><?php echo lang('general_word_sent'); ?></td>
321321
<td width="25%"><?php echo $total_qrz_sent; ?></td>
322-
<td width="25%"><a href="javascript:displayContacts('','all','all','QRZSDATE','');"><?php echo $qrz_sent_today; ?></a></td>
322+
<td width="25%"><a href="javascript:displayContacts('','all','all','All','All','QRZSDATE','');"><?php echo $qrz_sent_today; ?></a></td>
323323
</tr>
324324

325325
<tr>
326326
<td width="50%"><?php echo lang('general_word_received'); ?></td>
327327
<td width="25%"><?php echo $total_qrz_rcvd; ?></td>
328-
<td width="25%"><a href="javascript:displayContacts('','all','all','QRZRDATE','');"><?php echo $qrz_rcvd_today; ?></a></td>
328+
<td width="25%"><a href="javascript:displayContacts('','all','all','All','All','QRZRDATE','');"><?php echo $qrz_rcvd_today; ?></a></td>
329329
</tr>
330330
</table>
331331
<?php } ?>

‎application/views/lookup/result.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
<td>'. strtoupper($mode) .'</td>';
1616
foreach ($value as $key => $val) {
1717
switch($type) {
18-
case 'dxcc': $linkinfo = '<a href=\'javascript:displayContacts("'.str_replace("&", "%26", $dxcc).'","' . $key . '","' . $mode . '","DXCC2")\'>' . $val . '</a>'; break;
19-
case 'iota': $linkinfo = '<a href=\'javascript:displayContacts("'.str_replace("&", "%26", $iota).'","' . $key . '","' . $mode . '","IOTA")\'>' . $val . '</a>'; break;
20-
case 'vucc': $linkinfo = '<a href=\'javascript:displayContacts("'.str_replace("&", "%26", $grid).'","' . $key . '","' . $mode . '","VUCC")\'>' . $val . '</a>'; break;
21-
case 'cq': $linkinfo = '<a href=\'javascript:displayContacts("'.str_replace("&", "%26", $cqz).'","' . $key . '","' . $mode . '","CQZone")\'>' . $val . '</a>'; break;
22-
case 'was': $linkinfo = '<a href=\'javascript:displayContacts("'.str_replace("&", "%26", $was).'","' . $key . '","' . $mode . '","WAS")\'>' . $val . '</a>'; break;
23-
case 'sota': $linkinfo = '<a href=\'javascript:displayContacts("'.str_replace("&", "%26", $sota).'","' . $key . '","' . $mode . '","SOTA")\'>' . $val . '</a>'; break;
24-
case 'wwff': $linkinfo = '<a href=\'javascript:displayContacts("'.str_replace("&", "%26", $wwff).'","' . $key . '","' . $mode . '","WWFF")\'>' . $val . '</a>'; break;
18+
case 'dxcc': $linkinfo = '<a href=\'javascript:displayContacts("'.str_replace("&", "%26", $dxcc).'","' . $key . '","' . $mode . '","All","All","DXCC2")\'>' . $val . '</a>'; break;
19+
case 'iota': $linkinfo = '<a href=\'javascript:displayContacts("'.str_replace("&", "%26", $iota).'","' . $key . '","' . $mode . '","All","All","IOTA")\'>' . $val . '</a>'; break;
20+
case 'vucc': $linkinfo = '<a href=\'javascript:displayContacts("'.str_replace("&", "%26", $grid).'","' . $key . '","' . $mode . '","All","All","VUCC")\'>' . $val . '</a>'; break;
21+
case 'cq': $linkinfo = '<a href=\'javascript:displayContacts("'.str_replace("&", "%26", $cqz).'","' . $key . '","' . $mode . '","All","All","CQZone")\'>' . $val . '</a>'; break;
22+
case 'was': $linkinfo = '<a href=\'javascript:displayContacts("'.str_replace("&", "%26", $was).'","' . $key . '","' . $mode . '","All","All","WAS")\'>' . $val . '</a>'; break;
23+
case 'sota': $linkinfo = '<a href=\'javascript:displayContacts("'.str_replace("&", "%26", $sota).'","' . $key . '","' . $mode . '","All","All","SOTA")\'>' . $val . '</a>'; break;
24+
case 'wwff': $linkinfo = '<a href=\'javascript:displayContacts("'.str_replace("&", "%26", $wwff).'","' . $key . '","' . $mode . '","All","All","WWFF")\'>' . $val . '</a>'; break;
2525
}
2626

2727
$info = '<td>';

0 commit comments

Comments
 (0)