Merge branch 'magicbug:master' into master

application/language/spanish/account_lang.php

@@ -0,0 +1,10 @@
+<?php
+
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+$lang['account_logbook_fields'] = 'Campos a mostrar en el Logbook';
+$lang['account_column1_text'] = 'Columna 1';
+$lang['account_column2_text'] = 'Columna 2';
+$lang['account_column3_text'] = 'Columna 3';
+$lang['account_column4_text'] = 'Columna 4';
+$lang['account_column5_text'] = 'Columna 5 (solo en logbook)';

application/language/spanish/general_words_lang.php

@@ -90,6 +90,9 @@ $lang['gen_hamradio_usa_state'] = 'Estado USA';
 $lang['gen_hamradio_iota_reference'] = 'Referencia IOTA';
 $lang['gen_hamradio_sota_reference'] = 'Referencia SOTA';
 $lang['gen_hamradio_dok'] = 'DOK';
+$lang['gen_hamradio_state'] = 'Estado';
+$lang['gen_hamradio_iota'] = 'IOTA';
+$lang['gen_hamradio_gridsquare'] = 'Gridsquare';
 
 $lang['gen_hamradio_sig'] = 'Señal';
 $lang['gen_hamradio_sig_info'] = 'Información de señal';

application/libraries/Qrz.php

@@ -10,7 +10,7 @@ class Qrz {
 	// Return session key
 	public function session($username, $password) {
 		// URL to the XML Source
-		$xml_feed_url = 'http://xmldata.qrz.com/xml/current/?username='.$username.';password='.$password.';agent=cloudlog';
+		$xml_feed_url = 'http://xmldata.qrz.com/xml/current/?username='.$username.';password='.urlencode($password).';agent=cloudlog';
 		
 		// CURL Functions
 		$ch = curl_init();
@@ -33,7 +33,7 @@ class Qrz {
 		$ci = & get_instance();
 		
 		// URL to the XML Source
-		$xml_feed_url = 'http://xmldata.qrz.com/xml/current/?username='.$username.';password='.$password.';agent=cloudlog';
+		$xml_feed_url = 'http://xmldata.qrz.com/xml/current/?username='.$username.';password='.urlencode($password).';agent=cloudlog';
 		
 		// CURL Functions
 		$ch = curl_init();

application/models/Counties.php

@@ -47,7 +47,7 @@ class Counties extends CI_Model
             " and COL_DXCC in ('291', '6', '110')
                 and coalesce(COL_CNTY, '') <> ''
                 and COL_BAND != 'SAT'
-                group by thcv.COL_STATE
+                group by thcv.COL_STATE, countycountconfirmed
                 order by thcv.COL_STATE";
 
         $query = $this->db->query($sql);

assets/json/satellite_data.json

@@ -239,6 +239,18 @@
          ]
       }
    },
+   "JO-97":{
+      "Modes":{
+         "U/V":[
+            {
+               "Uplink_Mode":"LSB",
+               "Uplink_Freq":"435110000",
+               "Downlink_Mode":"USB",
+               "Downlink_Freq":"145865000"
+            }
+         ]
+      }
+   },
    "Lilacsat-1":{
       "Modes":{
          "V/U":[