Merge pull request wavelog#2670 from phl0/fixHamqthLib

Fix hamqth lib

Author: phl0

application/libraries/Callbook.php

@@ -125,7 +125,12 @@ function hamqth($username, $password, $callsign) {
 
 		if (!$this->ci->session->userdata('hamqth_session_key')) {
 			$hamqth_session_key = $this->ci->hamqth->session($username, $password);
-			$this->ci->session->set_userdata('hamqth_session_key', $hamqth_session_key);
+			if ($hamqth_session_key == false) {
+				$callbook['error'] = __("Error obtaining a session key for HamQTH query");
+				return $callbook;
+			} else {
+				$this->ci->session->set_userdata('hamqth_session_key', $hamqth_session_key);
+			}
 		}
 
 		$callbook = $this->ci->hamqth->search($callsign, $this->ci->session->userdata('hamqth_session_key'));

application/libraries/Hamqth.php

@@ -21,6 +21,10 @@ public function session($username, $password) {
 		curl_setopt($ch, CURLOPT_TIMEOUT, 10);
 		$xml = curl_exec($ch);
 		curl_close($ch);
+		if(curl_errno($ch)) {
+			log_message('error', 'Hamqth query failed: '.curl_strerror(curl_errno($ch))." (".curl_errno($ch).")");
+			return false;
+		}
 
 		// Create XML object
 		$xml = simplexml_load_string($xml);

application/views/qso/index.php

@@ -893,7 +893,7 @@
         </div>
 
         <div class="card-body callsign-image d-flex gap-3">
-            <div class="callsign-image-content" id="callsign-image-content" style="flex-shrink: 0; max-width: 100%;">
+            <div class="callsign-image-content" id="callsign-image-content" style="flex-shrink: 0;">
             </div>
             <div class="callsign-image-info" id="callsign-image-info" style="flex-grow: 1; min-width: 0; display: none;">
             </div>

assets/css/general.css

@@ -647,6 +647,7 @@ div#station_logbooks_linked_table_paginate {
 .callsign-image-content {
 	display: block;
 	max-height: 300px;
+	max-width: 75%;
 	text-align: center;
 }
 
@@ -1417,4 +1418,4 @@ svg text.month { fill: #AAA; }
 /* Ensure tooltip appears above everything */
 .tooltip {
     z-index: 9999 !important;
-}
+}