Now reading the URL for LoTW download from config file incase they change it.
这个提交包含在:
		
							父节点
							
								
									a3a195b6ea
								
							
						
					
					
						当前提交
						950037ada0
					
				
					共有  2 个文件被更改,包括 23 次插入 和 3 次删除
				
			
		|  | @ -60,12 +60,26 @@ $config['auth_level'][99] = "Administrator"; | ||||||
| |-------------------------------------------------------------------------- | |-------------------------------------------------------------------------- | ||||||
| | | | | ||||||
| |  'username'    QRZ.com Username | |  'username'    QRZ.com Username | ||||||
| |  'password'    Default locator used to calculate bearings/distance | |  'password'    QRZ.com Password | ||||||
| */ | */ | ||||||
| 
 | 
 | ||||||
| $config['qrz_username'] = ""; | $config['qrz_username'] = ""; | ||||||
| $config['qrz_password'] = ""; | $config['qrz_password'] = ""; | ||||||
| 
 | 
 | ||||||
|  | /* | ||||||
|  | |-------------------------------------------------------------------------- | ||||||
|  | | Logbook of The World (LoTW) Options | ||||||
|  | |-------------------------------------------------------------------------- | ||||||
|  | | | ||||||
|  | |  'lotw_download_url'    Download URL | ||||||
|  | |  'lotw_upload_url'	  Upload URL | ||||||
|  | |  'lotw_rcvd_mark'       How to mark LoTW confirmations ('Y' or 'V') | ||||||
|  | */ | ||||||
|  | 
 | ||||||
|  | $config['lotw_download_url'] = "https://p1k.arrl.org/lotwuser/lotwreport.adi"; | ||||||
|  | $config['lotw_upload_url'] = "https://p1k.arrl.org/lotwuser/upload"; | ||||||
|  | $config['lotw_rcvd_mark'] = "Y"; | ||||||
|  | 
 | ||||||
| /* | /* | ||||||
| |-------------------------------------------------------------------------- | |-------------------------------------------------------------------------- | ||||||
| | Base Site URL | | Base Site URL | ||||||
|  |  | ||||||
|  | @ -52,6 +52,12 @@ class Lotw extends CI_Controller { | ||||||
| 			   $time_off = date('Y-m-d', strtotime($record['qso_date'])) ." ".date('H:i', strtotime($record['time_on']));   | 			   $time_off = date('Y-m-d', strtotime($record['qso_date'])) ." ".date('H:i', strtotime($record['time_on']));   | ||||||
| 			} | 			} | ||||||
| 			 | 			 | ||||||
|  | 			// If defined in the config file that we want a V (for Verified) instead of a Y (for Yes), use that
 | ||||||
|  | 			if ($this->config->item('lotw_rcvd_mark') != "Y" && $record['qsl_rcvd'] == "Y") | ||||||
|  | 			{ | ||||||
|  | 				$record['qsl_rcvd'] = "V"; | ||||||
|  | 			} | ||||||
|  | 			 | ||||||
| 			$status = $this->logbook_model->import_check($time_on, $record['call'], $record['band']); | 			$status = $this->logbook_model->import_check($time_on, $record['call'], $record['band']); | ||||||
| 			$lotw_status = $this->logbook_model->lotw_update($time_on, $record['call'], $record['band'], $qsl_date, $record['qsl_rcvd']); | 			$lotw_status = $this->logbook_model->lotw_update($time_on, $record['call'], $record['band'], $qsl_date, $record['qsl_rcvd']); | ||||||
| 	 | 	 | ||||||
|  | @ -112,7 +118,7 @@ class Lotw extends CI_Controller { | ||||||
| 			// TODO: Specifiy in config file whether we want LoTW confirms as V or Y. Both are acceptable under ADIF specification. HRD seems to use V. Everyone else that I've used uses Y.
 | 			// TODO: Specifiy in config file whether we want LoTW confirms as V or Y. Both are acceptable under ADIF specification. HRD seems to use V. Everyone else that I've used uses Y.
 | ||||||
| 			 | 			 | ||||||
| 			// Build URL for LoTW report file
 | 			// Build URL for LoTW report file
 | ||||||
| 			$lotw_url = "https://p1k.arrl.org/lotwuser/lotwreport.adi?"; | 			$lotw_url = $this->config->item('lotw_download_url') . "?"; | ||||||
| 			$lotw_url .= "login=" . $data['user_lotw_name']; | 			$lotw_url .= "login=" . $data['user_lotw_name']; | ||||||
| 			$lotw_url .= "&password=" . $data['user_lotw_password']; | 			$lotw_url .= "&password=" . $data['user_lotw_password']; | ||||||
| 			$lotw_url .= "&qso_query=1&qso_qsl='yes'"; | 			$lotw_url .= "&qso_query=1&qso_qsl='yes'"; | ||||||
|  |  | ||||||
		正在加载…
	
		在新工单中引用