Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
crx-framework
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
crx-php
crx-framework
Commits
c5bd3b28
Commit
c5bd3b28
authored
Dec 31, 2018
by
f4eyq
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update framework 31/12 1
parent
af6468bd
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
193 additions
and
178 deletions
+193
-178
changelog.txt
changelog.txt
+6
-2
classes/class.crx.core/crxCore.php
classes/class.crx.core/crxCore.php
+3
-4
classes/class.crx.libs/generic/genericOb.php
classes/class.crx.libs/generic/genericOb.php
+21
-19
classes/class.crx.libs/geography/class.crx.geo.locator.php
classes/class.crx.libs/geography/class.crx.geo.locator.php
+1
-1
classes/class.crx.libs/htmlInterface/fastTemplate.php
classes/class.crx.libs/htmlInterface/fastTemplate.php
+2
-0
classes/class.crx.libs/load.order.xml
classes/class.crx.libs/load.order.xml
+8
-0
classes/class.crx.libs/radioamator/abstractDxClusterSpot.php
classes/class.crx.libs/radioamator/abstractDxClusterSpot.php
+1
-1
classes/class.crx.libs/radioamator/class.dxClusterSpots.php
classes/class.crx.libs/radioamator/class.dxClusterSpots.php
+44
-51
classes/class.crx.libs/radioamator/dxClusterSpot.php
classes/class.crx.libs/radioamator/dxClusterSpot.php
+1
-1
classes/class.crx.libs/radioamator/dxClusterSpotHam.php
classes/class.crx.libs/radioamator/dxClusterSpotHam.php
+91
-77
classes/class.crx.libs/radioamator/spotMode.php
classes/class.crx.libs/radioamator/spotMode.php
+14
-11
classes/class.crx.libs/webapps/crxDataSource.php
classes/class.crx.libs/webapps/crxDataSource.php
+1
-11
No files found.
changelog.txt
View file @
c5bd3b28
------------------------
CRX FRAMEWORK
Current version:2.0.1
Update:1
0
/2018
Update:1
2
/2018
Date:01/2008
------------------------
Update 31/12/2018
------------------------
- minor change on ham mode lib.
- remove bug into sql generator into ham and 11m spots lib.
------------------------
Update 08/10/2018
------------------------
...
...
classes/class.crx.core/crxCore.php
View file @
c5bd3b28
...
...
@@ -330,10 +330,9 @@ class crxCore{
throw
new
crxException
(
"ERROR : loadPackage() =>
$error
"
);
return
false
;
}
$cache
=
$_SESSION
[
'class_xml_stack'
];
$cache
=
array
();
if
(
isset
(
$_SESSION
[
'class_xml_stack'
]))
$cache
=
$_SESSION
[
'class_xml_stack'
];
if
(
!
isset
(
$cache
[
$key_namespace
])){
$cache
[
$key_namespace
]
=
$this
->
loadPackageCreateNameSpaceDataSource
(
$xml_dir_namespace
);
...
...
classes/class.crx.libs/generic/genericOb.php
View file @
c5bd3b28
...
...
@@ -16,6 +16,26 @@
var
$_force_insert_with_pk_field_set
=
0
;
function
setTableName
(
$t
){
$this
->
_table
=
$t
;
}
function
getTableName
(){
return
$this
->
_table
;
}
function
getTablePrefix
(){
return
$this
->
c_db
->
dbi
->
Prefix
;
}
public
function
__set
(
$key
,
$value
)
{
$this
->
itemsProperties
[
0
][
$key
]
=
$value
;
...
...
@@ -243,25 +263,7 @@
}
function
setTableName
(
$t
){
$this
->
_table
=
$t
;
}
function
getTableName
(){
return
$this
->
_table
;
}
function
getTablePrefix
(){
return
$this
->
c_db
->
dbi
->
Prefix
;
}
function
updateSchema
(){
...
...
classes/class.crx.libs/geography/class.crx.geo.locator.php
View file @
c5bd3b28
<?php
/*
**********************************************************************
* Crx-cms powered by CRX-PHP-FRAMEWORK http
://git.crx.cloud/crx-php/crx-framework
* Crx-cms powered by CRX-PHP-FRAMEWORK http
s://project.crx.cloud/crx-framework-doc
* Copyright (c) Bastien Barbe and contributors. All rights
* reserved.
* Crx-cms is free software; you can redistribute it and/or modify
...
...
classes/class.crx.libs/htmlInterface/fastTemplate.php
View file @
c5bd3b28
...
...
@@ -59,6 +59,8 @@ extends crxHtmlInterface{
}
}
// end (new) FastTemplate ()
...
...
classes/class.crx.libs/load.order.xml
View file @
c5bd3b28
<?xml version="1.0" encoding="ISO-8859-1"?>
<global>
<item>
<version>
1.0
</version>
<class_name>
crxLoaderForLib
</class_name>
<class_group>
library
</class_group>
<class_desc>
Using to load librairy based on composer and co.
</class_desc>
<class_file>
crxLoaderForLib.php
</class_file>
<is_load>
1
</is_load>
</item>
<item>
<version>
1.0
</version>
<class_name>
crxMath
</class_name>
...
...
classes/class.crx.libs/radioamator/abstractDxClusterSpot.php
View file @
c5bd3b28
<?php
// extends generic_crxItem
// v1
1
2018
// v1
2
2018
class
abstractDxClusterSpot
{
var
$_debug_details
=
''
;
...
...
classes/class.crx.libs/radioamator/class.dxClusterSpots.php
View file @
c5bd3b28
<?php
/**
* @date 01/01/2005
* @revision 1
111
2018
* @revision 1
2
2018
* @lib radioamator
* @copyright see header
*/
...
...
@@ -17,7 +17,6 @@ extends abstractDxClusterSpot{
var
$xmlClusterShema
=
array
();
var
$debug
=
FALSE
;
var
$c_db
=
FALSE
;
function
getDxClusterStatsDxSpotBestTimeForDx
(
$time_select
=
array
(
'start'
,
'end'
),
...
...
@@ -173,20 +172,12 @@ extends abstractDxClusterSpot{
function
getDataFromParameters
(
$params
){
//crxFile::setFileContent('/home/hosting/www_root/ham.crx.cloud/logs/test','params:'.dumper($params));
$this
->
initGetDataFromParameters
(
$params
);
$sql_limit_result
=
$this
->
display_filters_start_pointer
.
","
.
$this
->
display_filters_end_pointer
;
if
(
$this
->
display_use_dxcc_filter
&&
is_array
(
$this
->
display_filters_send_filter
)
&&
is_array
(
$this
->
display_filters_spot_filter
)
){
$sep
=
','
;
...
...
@@ -201,47 +192,42 @@ extends abstractDxClusterSpot{
$string_filter_dxcc
.
=
$v
.
$sep
;
}
}
$string_filter_dxcc
=
crxString
::
removeCharEndOfStr
(
$string_filter_dxcc
,
1
);
if
(
$string_filter_sender
&&
$string_filter_dxcc
){
$sql_set_filter
=
'WHERE (truncate( callsign_sender, 0 ) IN ( '
.
$string_filter_sender
.
' ))'
;
$sql_set_filter
.
=
'AND (truncate( country_id_dx, 0 ) IN ( '
.
$string_filter_dxcc
.
' ))'
;
//$sql_set_filter = 'WHERE (truncate( callsign_sender, 0 ) IN ( '.$string_filter_sender.' )) AND (truncate( callsign_dx, 0 ) IN ( '.$string_filter_dxcc.' ))';
$sql_set_filter
.
=
' AND (truncate( country_id_dx, 0 ) IN ( '
.
$string_filter_dxcc
.
' ))'
;
}
}
if
(
is_array
(
$this
->
bands_filtering_selected
)){
$c
=
0
;
foreach
(
$this
->
bands_filtering_selected
as
$k
=>
$v
){
if
(
$v
<>
1
){
unset
(
$this
->
bands_filtering_selected
[
$k
]);}
if
(
$v
==
1
)
$c
++
;
}
if
(
$string_filter_sender
&&
$string_filter_dxcc
){
$sql_set_filter
.
=
" AND "
;
}
else
{
if
(
$c
<>
0
)
$sql_set_filter
.
=
" WHERE "
;
}
$i
=
0
;
$bands
=
0
;
foreach
(
$this
->
bands_filtering_selected
as
$k
=>
$v
){
if
(
$v
==
1
)
$sql_set_filter
.
=
' band = "'
.
$k
.
'" '
;
if
(
$i
>=
0
&&
$i
<=
(
count
(
$this
->
bands_filtering_selected
)
-
2
)){
$sql_set_filter
.
=
'OR'
;
$band_is_selected
=
0
;
foreach
(
$this
->
bands_filtering_selecte
as
$k
=>
$s
){
if
(
$s
==
1
){
$band_is_selected
=
1
;
break
;}}
if
(
$band_is_selected
){
$c
=
0
;
foreach
(
$this
->
bands_filtering_selected
as
$k
=>
$v
){
if
(
$v
<>
1
){
unset
(
$this
->
bands_filtering_selected
[
$k
]);}
if
(
$v
==
1
)
$c
++
;
}
if
(
$string_filter_sender
&&
$string_filter_dxcc
){
$sql_set_filter
.
=
" AND "
;
}
else
{
if
(
$c
<>
0
)
$sql_set_filter
.
=
" WHERE "
;
}
$i
=
0
;
$bands
=
0
;
foreach
(
$this
->
bands_filtering_selected
as
$k
=>
$v
){
if
(
$v
==
1
)
$sql_set_filter
.
=
' band = "'
.
$k
.
'" '
;
if
(
$i
>=
0
&&
$i
<=
(
count
(
$this
->
bands_filtering_selected
)
-
2
)){
$sql_set_filter
.
=
'OR'
;
}
$bands
++
;
$i
++
;
}
$bands
++
;
$i
++
;
}
}
$sql_get_data
=
'SELECT * FROM `'
.
$this
->
display_tbl_crx_spots
.
'`'
;
$sql_set_filter_columns_settings
=
NULL
;
//
$sql_set_filter_columns_settings=NULL;
if
(
$this
->
display_use_dxnodes_filter
){
...
...
@@ -260,20 +246,26 @@ extends abstractDxClusterSpot{
}
$j
=
0
;
foreach
(
$this
->
display_use_dxnodes_filter
as
$k
=>
$v
){
if
(
$v
==
1
){
if
(
$j
==
0
)
$sql_set_filter
_columns_settings
.
=
$join_this_filter
.
' ( `source` = \''
.
$k
.
'\''
;
if
(
$j
==
0
)
$sql_set_filter
.
=
$join_this_filter
.
' ( `source` = \''
.
$k
.
'\''
;
if
(
$j
<>
0
&&
$j
>
$i
)
$sql_set_filter
_columns_settings
.
=
' OR `source` = \''
.
$k
.
'\''
;
elseif
(
$j
>
0
)
$sql_set_filter
_columns_settings
.
=
' OR `source` = \''
.
$k
.
'\''
;
if
(
$j
<>
0
&&
$j
>
$i
)
$sql_set_filter
.
=
' OR `source` = \''
.
$k
.
'\''
;
elseif
(
$j
>
0
)
$sql_set_filter
.
=
' OR `source` = \''
.
$k
.
'\''
;
$j
++
;
}
}
if
(
$j
>
0
)
$sql_set_filter_columns_settings
.
=
' )'
;
}
if
(
$j
>
0
)
$sql_set_filter
.
=
' )'
;
$join_this_filter
=
''
;
}
if
(
$this
->
display_use_modes_filter
){
//if($sql_set_filter_columns_settings==NULL) $join_this_filter=' WHERE';
//else $join_this_filter=' AND';
$i
=
0
;
foreach
(
$this
->
display_use_modes_filter
as
$k
=>
$v
){
if
(
$v
==
1
){
$i
++
;
}
}
...
...
@@ -282,6 +274,7 @@ extends abstractDxClusterSpot{
$i
=-
1
;
}
if
(
$i
<>-
1
){
if
(
$sql_set_filter
){
$sql_set_filter
.
=
" AND "
;
...
...
@@ -396,21 +389,21 @@ extends abstractDxClusterSpot{
}
}
$sql_limit_result
=
" ORDER BY "
.
$this
->
display_filters_order_by
.
" DESC LIMIT "
.
$sql_limit_result
;
$final_querie_get_dxcluster_spots
=
$sql_get_data
.
" "
.
$sql_set_filter
.
$sql_set_filter_columns_settings
.
" "
.
$sql_limit_result
;
if
(
$debug
)
var_dump
(
$final_querie_get_dxcluster_spots
);
$this
->
c_db
->
query
=
$final_querie_get_dxcluster_spots
;
//var_dump($final_querie_get_dxcluster_spots);
//if($this->debug)crxFile::setFileContent('/home/hosting/www_root/ham.crx.cloud/logs/test','DEBUG:'.dumper($final_querie_get_dxcluster_spots));
/*
var_dump($final_querie_get_dxcluster_spots);
die();
*/
$spots
=
$this
->
c_db
->
getArrayOfResult
();
return
$spots
;
//if($this->debug)crxFile::setFileContent('/home/hosting/www_root/ham.crx.cloud/logs/test','DEBUG:'.dumper($final_querie_get_dxcluster_spots));
return
$this
->
c_db
->
getArrayOfResult
();
}
function
computeGeoInformation
(
$user_info
=
array
()){
...
...
classes/class.crx.libs/radioamator/dxClusterSpot.php
View file @
c5bd3b28
<?php
//Interface class to use dxClusterSpot HAM or 11M.
//u:1
1
2018
//u:1
2
2018
class
dxClusterSpot
{
...
...
classes/class.crx.libs/radioamator/dxClusterSpotHam.php
View file @
c5bd3b28
<?php
/**
* @creation date 082014
* @revision
1111
2018
* @revision
0412
2018
* @module dxClusterWeb/dxClusterSpotHam
*/
class
dxClusterSpotHam
...
...
@@ -699,7 +699,7 @@ extends abstractDxClusterSpot{
}
function
getDxClusterStatsContinentDxSpotRepartition
(
$time_select
=
array
(
'start'
,
'end'
),
$user_continent
=
'EU'
,
$nb_total_spots
=
0
,
$user_band_selected
=
'ALL'
){
$sql_qrg_filter
=
''
;
if
(
$user_band_selected
<>
'ALL'
){
$bd
=
$user_band_selected
;
...
...
@@ -1013,9 +1013,6 @@ extends abstractDxClusterSpot{
if
(
is_array
(
$this
->
bands_filtering_selected
))
foreach
(
$this
->
bands_filtering_selected
as
$k
=>
$v
){
if
(
$v
==
'1'
){
$selected
=
1
;
break
;}}
//@DEBUG :
//$_SESSION['cache-spots']['band_filter_info']['all_without_checked_any']=NULL;
if
(
!
$selected
){
$list_band_user_filter
=
array
();
...
...
@@ -1035,9 +1032,8 @@ extends abstractDxClusterSpot{
}
if
(
is_array
(
$this
->
bands_filtering_selected
)){
$user_select_all_band
=
0
;
$user_select_all_band
=
0
;
//all bands are selected :
if
(
count
(
$this
->
bands_filtering_selected
)
==
22
){
...
...
@@ -1074,28 +1070,19 @@ extends abstractDxClusterSpot{
}
$qrg
=
new
spotQrg
();
$i
=
0
;
$bands
=
0
;
$i
=
0
;
if
(
isset
(
$this
->
display_band_part_filter
)){
$bd
=
$this
->
display_band_part_filter
;
//ssb cw phone digit space
}
else
{
$bd
=
'band'
;
//View all the band by default.
}
//echo "<b>$display_band_part_filter</b>";
//sql_set_filter => ( QRG )
$bands
=
1
;
if
(
empty
(
$this
->
bands_filtering_selected
)){
//var_dump($this->bands_filtering_selected);
//var_dump($_SESSION['cache-spots']['band_filter_info']['list_band_user_filter']);
$this
->
bands_filtering_selected
=
$_SESSION
[
'cache-spots'
][
'band_filter_info'
][
'list_band_user_filter'
];
//var_dump($this->bands_filtering_selected);
}
else
{
...
...
@@ -1105,7 +1092,7 @@ extends abstractDxClusterSpot{
if
(
isset
(
$_SESSION
[
'cache-spots'
][
'band_filter_info'
])){
$cache
=
$_SESSION
[
'cache-spots'
][
'band_filter_info'
];
$cache
=
$_SESSION
[
'cache-spots'
][
'band_filter_info'
];
$list_band_user_filter
=
$cache
[
'list_band_user_filter'
];
...
...
@@ -1113,6 +1100,7 @@ extends abstractDxClusterSpot{
}
if
(
$limit_band_display_filter
){
$list_band_user_filter2
=
$list_band_user_filter
;
...
...
@@ -1125,76 +1113,92 @@ extends abstractDxClusterSpot{
if
(
count
(
$list_band_user_filter
)
>
0
){
$this
->
bands_filtering_selected
=
$list_band_user_filter
;}
else
{
$this
->
bands_filtering_selected
=
$list_band_user_filter2
;}
}
$bands
=
0
;
foreach
(
$this
->
bands_filtering_selected
as
$k
=>
$v
){
$selected_band_section
=
array
();
$cache
=
array
();
$selected_band_section
=
array
();
$cache
=
array
();
if
(
isset
(
$_SESSION
[
'cache-spots'
][
'band_filter_info'
]))
$cache
=
$_SESSION
[
'cache-spots'
][
'band_filter_info'
];
if
(
isset
(
$cache
[
'selected_band_section'
][
$k
])
&&
$cache
[
'selected_band_section'
][
$k
]){
if
(
isset
(
$_SESSION
[
'cache-spots'
][
'band_filter_info'
]))
$cache
=
$_SESSION
[
'cache-spots'
][
'band_filter_info'
];
$selected_band_section
=
$cache
[
'selected_band_section'
][
$k
];
}
else
{
if
(
isset
(
$cache
[
'selected_band_section'
][
$k
])
&&
$cache
[
'selected_band_section'
][
$k
]){
$selected_band_section
=
$cache
[
'selected_band_section'
][
$k
];
$q
=
"SELECT * FROM `crx_cluster_dxcc_filter_bands` WHERE `user_id` = '"
.
$user_id
.
"' AND band_id = '"
.
$k
.
"'"
;
$this
->
c_db
->
execSql
(
$q
);
while
(
$r
=
$this
->
c_db
->
returnLine
()){
$selected_band_section
[]
=
$r
[
'band_section_id'
];}
if
(
empty
(
$selected_band_section
)){
$selected_band_section
[
'band'
]
=
'band'
;}
$cache
[
'selected_band_section'
][
$k
]
=
$selected_band_section
;
$_SESSION
[
'cache-spots'
][
'band_filter_info'
]
=
$cache
;
}
$bvl
=
$qrg
->
getBandValues
(
$k
);
$sections_count
=
count
(
$selected_band_section
);
$cpts
=
0
;
foreach
(
$selected_band_section
as
$km
=>
$section
){
$cpts
++
;}
}
else
{
$q
=
"SELECT * FROM `crx_cluster_dxcc_filter_bands` WHERE `user_id` = '"
.
$user_id
.
"' AND band_id = '"
.
$k
.
"'"
;
$this
->
c_db
->
execSql
(
$q
);
while
(
$r
=
$this
->
c_db
->
returnLine
()){
$selected_band_section
[]
=
$r
[
'band_section_id'
];}
if
(
empty
(
$selected_band_section
)){
$selected_band_section
[
'band'
]
=
'band'
;}
$cache
[
'selected_band_section'
][
$k
]
=
$selected_band_section
;
$_SESSION
[
'cache-spots'
][
'band_filter_info'
]
=
$cache
;
}
$bvl
=
$qrg
->
getBandValues
(
$k
);
$sections_count
=
count
(
$selected_band_section
);
$cpts
=
0
;
foreach
(
$selected_band_section
as
$km
=>
$section
){
$cpts
++
;}
$nb
=
count
(
$bvl
)
-
1
;
$nb
=
count
(
$bvl
)
-
1
;
if
(
$nb
==
$cpts
){
$use_all_band_segment
=
1
;
}
else
{
$use_all_band_segment
=
0
;
}
if
(
$nb
==
$cpts
){
$use_all_band_segment
=
1
;
}
else
{
$use_all_band_segment
=
0
;
}
if
(
!
$use_all_band_segment
){
$i
=
1
;
foreach
(
$selected_band_section
as
$k
=>
$section
){
if
(
$sections_count
==
$i
){
$sep
=
' '
;}
else
$sep
=
' OR '
;
$bd
=
$section
;
$l
=
$bvl
[
$bd
][
0
];
$h
=
$bvl
[
$bd
][
1
];
if
(
!
$use_all_band_segment
){
if
(
$v
&&
$l
&&
$h
)
//if($v==1 && $l && $h)
$nb_selected_band_section
=
1
;
foreach
(
$selected_band_section
as
$k
=>
$section
){
$sep
=
' OR '
;
if
(
$sections_count
==
$nb_selected_band_section
){
$sep
=
' '
;}
if
((
$bands
<>
count
(
$this
->
bands_filtering_selected
)
-
1
))
$sep
=
' OR '
;
$bd
=
$section
;
$l
=
$bvl
[
$bd
][
0
];
$h
=
$bvl
[
$bd
][
1
];
if
(
$v
&&
$l
&&
$h
)
//if($v==1 && $l && $h)
$sql_set_filter
.
=
"
\n
"
.
'( freq >= '
.
$l
.
' AND freq <= '
.
$h
.
')'
.
$sep
;
$i
++
;
$nb_selected_band_section
++
;
}
}
}
else
{
$sep
=
''
;
else
{
$sep
=
' OR '
;
if
((
$bands
==
count
(
$this
->
bands_filtering_selected
)
-
1
))
$sep
=
''
;
$l
=
$bvl
[
'band'
][
0
];
$h
=
$bvl
[
'band'
][
1
];
if
(
$l
&&
$h
)
$sql_set_filter
.
=
'( freq >= '
.
$l
.
' AND freq <= '
.
$h
.
')'
.
$sep
;
}
if
(
$bands
<=
(
count
(
$this
->
bands_filtering_selected
)
-
1
)
){
$sql_set_filter
.
=
' OR'
;
}
$bands
++
;
}
}
/*
if(!$use_all_band_segment && $bands<>0 && ($bands <> count($this->bands_filtering_selected) - 1 ) ){
$sql_set_filter .= ' OR';
}
*/
$bands
++
;
}
//foreach($this->bands_filtering_selected as $k=>$v)
}
...
...
@@ -1476,9 +1480,15 @@ extends abstractDxClusterSpot{
}
//if($this->debug)crxFile::setFileContent('/home/hosting/www_root/ham.crx.cloud/logs/test','DEBUG:'.dumper($final_querie_get_dxcluster_spots));
$this
->
_dsql
=
$final_querie_get_dxcluster_spots
;
/*
var_dump($final_querie_get_dxcluster_spots);
die();
*/
if
(
$exec_final_sql
){
$this
->
c_db
->
query
=
$final_querie_get_dxcluster_spots
;
...
...
@@ -1489,6 +1499,10 @@ extends abstractDxClusterSpot{
}
$this
->
_dsql
=
$final_querie_get_dxcluster_spots
;
$this
->
_debug_sql
=
0
;
if
(
$this
->
_debug_sql
){
$uid
=
crxFramework
::
getGlobalValue
(
'userId'
);
...
...
classes/class.crx.libs/radioamator/spotMode.php
View file @
c5bd3b28
...
...
@@ -17,13 +17,15 @@ class spotMode{
'FM'
=>
'FM'
,
'DSTAR'
=>
'DSTAR'
,
'PSK31'
=>
'PSK31'
,
'PSK31'
=>
'PSK31'
'PSK63'
=>
'PSK63'
,
'PSK125'
=>
'PSK125'
,
'SIM31'
=>
'SIM31'
,
'SSTV'
=>
'SSTV'
,
'ROS'
=>
'ROS'
,
'JT65'
=>
'JT65'
,
'OLIVIA'
=>
'OLIVIA'
,
'AMTORFEC'
=>
'AMTORFEC'
,
...
...
@@ -36,14 +38,9 @@ class spotMode{
'DOMINO'
=>
'DOMINO'
,
'DOMINOF'
=>
'DOMINOF'
,
'FT8'
=>
'FT8'
,
'FAX'
=>
'FAX'
,
'FMHELL'
=>
'FMHELL'
,
'FSK31'
=>
'FSK31'
,
'FSK441'
=>
'FSK441'
,
...
...
@@ -51,11 +48,17 @@ class spotMode{
'HELL'
=>
'HELL'
,
'HELL80'
=>
'HELL80'
,
'HFSK'
=>
'HFSK'
,
'FT8'
=>
'FT8'
,
'JS8'
=>
'JS8'
,
'JT65'
=>
'JT65'
,
'JT44'
=>
'JT44'
,
'JT65A'
=>
'JT65A'
,
'JT6M'
=>
'JT6M'
,
'MFSK8'
=>
'MFSK8'
,
'MFSK16'
=>
'MFSK16'
,
'MSK144'
=>
'MSK144'
,
'MT63'
=>
'MT63'
,
'PAC'
=>
'PAC'
,
...
...
@@ -103,13 +106,13 @@ class spotMode{
'phone'
=>
array
(
'SSB'
,
'AM'
,
'FM'
),