fix to retrieval of eqsl images. callsign can contain /. therefore
change to only pass id
这个提交包含在:
		
							父节点
							
								
									7329bd2c9d
								
							
						
					
					
						当前提交
						7207592276
					
				
					共有  3 个文件被更改,包括 23 次插入 和 10 次删除
				
			
		|  | @ -589,11 +589,24 @@ class eqsl extends CI_Controller { | ||||||
| 		$this->load->view('interface_assets/footer'); | 		$this->load->view('interface_assets/footer'); | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	function image($id, $callsign, $mode, $band, $hour, $minute, $day, $month, $year) { | 	function image($id) { | ||||||
| 		$this->load->library('electronicqsl'); | 		$this->load->library('electronicqsl'); | ||||||
| 		$this->load->model('Eqsl_images'); | 		$this->load->model('Eqsl_images'); | ||||||
| 
 | 
 | ||||||
| 		if($this->Eqsl_images->get_image($id) == "No Image") { | 		if($this->Eqsl_images->get_image($id) == "No Image") { | ||||||
|  | 			$this->load->model('logbook_model'); | ||||||
|  | 			$qso_query = $this->logbook_model->get_qso($id); | ||||||
|  | 			$qso = $qso_query->row(); | ||||||
|  | 			$qso_timestamp = strtotime($qso->COL_TIME_ON); | ||||||
|  | 			$callsign = $qso->COL_CALL; | ||||||
|  | 			$band = $qso->COL_BAND; | ||||||
|  | 			$mode = $qso->COL_MODE; | ||||||
|  | 			$year = date('Y', $qso_timestamp); | ||||||
|  | 			$month = date('m', $qso_timestamp); | ||||||
|  | 			$day = date('d', $qso_timestamp); | ||||||
|  | 			$hour = date('H', $qso_timestamp); | ||||||
|  | 			$minute = date('i', $qso_timestamp); | ||||||
|  | 
 | ||||||
| 			$query = $this->user_model->get_by_id($this->session->userdata('user_id')); | 			$query = $this->user_model->get_by_id($this->session->userdata('user_id')); | ||||||
| 			$q = $query->row(); | 			$q = $query->row(); | ||||||
| 			$username = $q->user_eqsl_name; | 			$username = $q->user_eqsl_name; | ||||||
|  |  | ||||||
|  | @ -97,7 +97,7 @@ | ||||||
| 			    <span class="eqsl-<?php echo ($row->COL_EQSL_QSL_SENT=='Y')?'green':'red'?>">▲</span>
 | 			    <span class="eqsl-<?php echo ($row->COL_EQSL_QSL_SENT=='Y')?'green':'red'?>">▲</span>
 | ||||||
| 			    <span class="eqsl-<?php echo ($row->COL_EQSL_QSL_RCVD=='Y')?'green':'red'?>"> | 			    <span class="eqsl-<?php echo ($row->COL_EQSL_QSL_RCVD=='Y')?'green':'red'?>"> | ||||||
| 			    	<?php if($row->COL_EQSL_QSL_RCVD =='Y') { ?>
 | 			    	<?php if($row->COL_EQSL_QSL_RCVD =='Y') { ?>
 | ||||||
| 			    	<a style="color: green" href="<?php echo site_url("eqsl/image/".$row->COL_PRIMARY_KEY."/".$row->COL_CALL."/".$row->COL_MODE."/".$row->COL_BAND."/".date('H', $timestamp)."/".date('i', $timestamp)."/".date('d', $timestamp)."/".date('m', $timestamp)."/".date('Y', $timestamp)); ?>" data-fancybox="images" data-width="528" data-height="336">▼</a>
 | 			    	<a style="color: green" href="<?php echo site_url("eqsl/image/".$row->COL_PRIMARY_KEY); ?>" data-fancybox="images" data-width="528" data-height="336">▼</a>
 | ||||||
| 			    	<?php } else { ?>
 | 			    	<?php } else { ?>
 | ||||||
| 			    		▼
 | 			    		▼
 | ||||||
| 			    	<?php } ?>
 | 			    	<?php } ?>
 | ||||||
|  |  | ||||||
|  | @ -205,7 +205,7 @@ | ||||||
|                         <span class="eqsl-<?php echo ($row->COL_EQSL_QSL_SENT=='Y')?'green':'red'?>">▲</span>
 |                         <span class="eqsl-<?php echo ($row->COL_EQSL_QSL_SENT=='Y')?'green':'red'?>">▲</span>
 | ||||||
|                         <span class="eqsl-<?php echo ($row->COL_EQSL_QSL_RCVD=='Y')?'green':'red'?>"> |                         <span class="eqsl-<?php echo ($row->COL_EQSL_QSL_RCVD=='Y')?'green':'red'?>"> | ||||||
| 			    	<?php if($row->COL_EQSL_QSL_RCVD =='Y') { ?>
 | 			    	<?php if($row->COL_EQSL_QSL_RCVD =='Y') { ?>
 | ||||||
|                         <a style="color: green" href="<?php echo site_url("eqsl/image/".$row->COL_PRIMARY_KEY."/".$row->COL_CALL."/".$row->COL_MODE."/".$row->COL_BAND."/".date('H', $timestamp)."/".date('i', $timestamp)."/".date('d', $timestamp)."/".date('m', $timestamp)."/".date('Y', $timestamp)); ?>" data-fancybox="images" data-width="528" data-height="336">▼</a>
 |                         <a style="color: green" href="<?php echo site_url("eqsl/image/".$row->COL_PRIMARY_KEY); ?>" data-fancybox="images" data-width="528" data-height="336">▼</a>
 | ||||||
|                     <?php } else { ?>
 |                     <?php } else { ?>
 | ||||||
|                         ▼
 |                         ▼
 | ||||||
|                     <?php } ?>
 |                     <?php } ?>
 | ||||||
|  |  | ||||||
		正在加载…
	
		在新工单中引用