From 08686b535a22c08844334e756dbf0cca42a7e3a2 Mon Sep 17 00:00:00 2001
From: Peter Goodhall <magicbug@users.noreply.github.com>
Date: Wed, 13 Dec 2017 13:34:08 +0000
Subject: [PATCH] Revert "Lotw url fix"

---
 application/controllers/lotw.php  | 4 ++--
 application/views/lotw/import.php | 2 +-
 install/assets/install.sql        | 2 +-
 sql/tables/config.sql             | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/application/controllers/lotw.php b/application/controllers/lotw.php
index f98584da..775e2c09 100644
--- a/application/controllers/lotw.php
+++ b/application/controllers/lotw.php
@@ -126,14 +126,14 @@ class Lotw extends CI_Controller {
 			// Build URL for LoTW report file
 			$lotw_url .= "?";
 			$lotw_url .= "login=" . $data['user_lotw_name'];
-			$lotw_url .= "&password=" . urlencode($data['user_lotw_password']);
+			$lotw_url .= "&password=" . $data['user_lotw_password'];
 			$lotw_url .= "&qso_query=1&qso_qsl='yes'";
 
 			//TODO: Option to specifiy whether we download location data from LoTW or not
 			//$lotw_url .= "&qso_qsldetail=\"yes\";
 
 			$lotw_url .= "&qso_qslsince=";
-			$lotw_url .= urlencode("$lotw_last_qsl_date");
+			$lotw_url .= "$lotw_last_qsl_date";
 
 			// Only pull back entries that belong to this callsign
 			$lotw_call = $this->session->userdata('user_callsign');
diff --git a/application/views/lotw/import.php b/application/views/lotw/import.php
index 226ad861..2e346124 100644
--- a/application/views/lotw/import.php
+++ b/application/views/lotw/import.php
@@ -7,7 +7,7 @@
 	<tr>
 		<td><input type="radio" name="lotwimport" id="upload" value="upload" checked /> Upload a file</td>
 		<td>
-			<p>Upload the Exported ADIF file from LoTW from the <a href="https://lotw.arrl.org/lotwuser/qsos?qsoscmd=adif" target="_blank">Download Report</a> Area, to mark QSOs as confirmed on LOTW.</p>
+			<p>Upload the Exported ADIF file from LoTW from the <a href="https://p1k.arrl.org/lotwuser/qsos?qsoscmd=adif" target="_blank">Download Report</a> Area, to mark QSOs as confirmed on LOTW.</p>
 			<p><span class="label important">Important</span> Log files must have the file type .adi</p>
 			<input type="file" name="userfile" size="20" />
 		</td>
diff --git a/install/assets/install.sql b/install/assets/install.sql
index a749012f..f827cdea 100755
--- a/install/assets/install.sql
+++ b/install/assets/install.sql
@@ -3805,6 +3805,6 @@ CREATE TABLE IF NOT EXISTS `config` (
 --
 
 INSERT INTO `config` (`id`, `lotw_download_url`, `lotw_upload_url`, `lotw_rcvd_mark`, `lotw_login_url`, `eqsl_download_url`, `eqsl_rcvd_mark`) VALUES
-(1, 'https://lotw.arrl.org/lotwuser/lotwreport.adi', 'https://lotw.arrl.org/lotwuser/upload', 'Y', 'https://lotw.arrl.org/lotwuser/default', 'http://www.eqsl.cc/qslcard/DownloadInBox.cfm', 'Y');
+(1, 'https://p1k.arrl.org/lotwuser/lotwreport.adi', 'https://p1k.arrl.org/lotwuser/upload', 'Y', 'https://p1k.arrl.org/lotwuser/default', 'http://www.eqsl.cc/qslcard/DownloadInBox.cfm', 'Y');
 
 ALTER TABLE `cat` ADD `downlink_freq` INT(11) NOT NULL AFTER `mode`, ADD `uplink_freq` INT(11) NOT NULL AFTER `downlink_freq`, ADD `downlink_mode` VARCHAR(255) NOT NULL AFTER `uplink_freq`, ADD `uplink_mode` VARCHAR(255) NOT NULL AFTER `downlink_mode`, ADD `sat_name` VARCHAR(255) NOT NULL AFTER `uplink_mode`;
diff --git a/sql/tables/config.sql b/sql/tables/config.sql
index 63150a8a..db6e105f 100644
--- a/sql/tables/config.sql
+++ b/sql/tables/config.sql
@@ -42,7 +42,7 @@ CREATE TABLE IF NOT EXISTS `config` (
 --
 
 INSERT INTO `config` (`id`, `lotw_download_url`, `lotw_upload_url`, `lotw_rcvd_mark`, `lotw_login_url`, `eqsl_download_url`, `eqsl_rcvd_mark`) VALUES
-(1, 'https://lotw.arrl.org/lotwuser/lotwreport.adi', 'https://lotw.arrl.org/lotwuser/upload', 'Y', 'https://lotw.arrl.org/lotwuser/default', 'http://www.eqsl.cc/qslcard/DownloadInBox.cfm', 'Y');
+(1, 'https://p1k.arrl.org/lotwuser/lotwreport.adi', 'https://p1k.arrl.org/lotwuser/upload', 'Y', 'https://p1k.arrl.org/lotwuser/default', 'http://www.eqsl.cc/qslcard/DownloadInBox.cfm', 'Y');
 
 /*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
 /*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;