2.8.8

.gitignore

@@ -2,6 +2,9 @@
 /application/config/config.php
 /application/config/managed.php
 /application/config/managed.sample.php
+/application/cache/*
+!/application/cache/index.html
+!/application/cache/.htaccess
 /application/logs/*.php
 /uploads/*.adi
 /uploads/*.ADI

application/config/migration.php

@@ -22,7 +22,7 @@
 |
 */
 
-$config['migration_version'] = 244;
+$config['migration_version'] = 250;
 
 /*
 |--------------------------------------------------------------------------

application/controllers/Dashboard.php

@@ -89,18 +89,35 @@ public function index()
 			//
 			$this->load->model('cat');
 			$this->load->model('vucc');
+
+			// Load cache driver for dashboard statistics caching (15 minutes)
+			$this->load->driver('cache', array('adapter' => 'file'));
 
 			$data['radio_status'] = $this->cat->recent_status();
 
-			// Store info - Use consolidated query for QSO statistics
-			$qso_stats = $this->logbook_model->get_qso_statistics_consolidated($logbooks_locations_array);
+			// Create cache key based on user and active logbook
+			$cache_key = 'dashboard_stats_' . $this->session->userdata('user_id') . '_' . $this->session->userdata('active_station_logbook');
+			$cache_ttl = 900; // 15 minutes
+
+			// Try to get QSO statistics from cache
+			$qso_stats = $this->cache->get($cache_key . '_qso');
+			if (!$qso_stats) {
+				// Cache miss - query database
+				$qso_stats = $this->logbook_model->get_qso_statistics_consolidated($logbooks_locations_array);
+				$this->cache->save($cache_key . '_qso', $qso_stats, $cache_ttl);
+			}
 			$data['todays_qsos'] = $qso_stats['todays_qsos'];
 			$data['total_qsos'] = $qso_stats['total_qsos'];
 			$data['month_qsos'] = $qso_stats['month_qsos'];
 			$data['year_qsos'] = $qso_stats['year_qsos'];
 
-			// Use consolidated countries statistics instead of separate queries
-			$countries_stats = $this->logbook_model->get_countries_statistics_consolidated($logbooks_locations_array);
+			// Try to get countries statistics from cache
+			$countries_stats = $this->cache->get($cache_key . '_countries');
+			if (!$countries_stats) {
+				// Cache miss - query database
+				$countries_stats = $this->logbook_model->get_countries_statistics_consolidated($logbooks_locations_array);
+				$this->cache->save($cache_key . '_countries', $countries_stats, $cache_ttl);
+			}
 
 			$data['total_countries'] = $countries_stats['Countries_Worked'];
 			$data['total_countries_confirmed_paper'] = $countries_stats['Countries_Worked_QSL'];
@@ -131,12 +148,27 @@ public function index()
 
 			// Only load VUCC data if the card is actually enabled
 			if ($data['dashboard_vuccgrids_card']) {
-				$data['vucc'] = $this->vucc->fetchVuccSummary();
-				$data['vuccSAT'] = $this->vucc->fetchVuccSummary('SAT');
+				// Try to get VUCC data from cache
+				$vucc_data = $this->cache->get($cache_key . '_vucc');
+				if (!$vucc_data) {
+					// Cache miss - query database
+					$vucc_data = array(
+						'vucc' => $this->vucc->fetchVuccSummary(),
+						'vuccSAT' => $this->vucc->fetchVuccSummary('SAT')
+					);
+					$this->cache->save($cache_key . '_vucc', $vucc_data, $cache_ttl);
+				}
+				$data['vucc'] = $vucc_data['vucc'];
+				$data['vuccSAT'] = $vucc_data['vuccSAT'];
 			}
 
-
-			$QSLStatsBreakdownArray = $this->logbook_model->get_QSLStats($logbooks_locations_array);
+			// Try to get QSL statistics from cache
+			$QSLStatsBreakdownArray = $this->cache->get($cache_key . '_qsl');
+			if (!$QSLStatsBreakdownArray) {
+				// Cache miss - query database
+				$QSLStatsBreakdownArray = $this->logbook_model->get_QSLStats($logbooks_locations_array);
+				$this->cache->save($cache_key . '_qsl', $QSLStatsBreakdownArray, $cache_ttl);
+			}
 
 			$data['total_qsl_sent'] = $QSLStatsBreakdownArray['QSL_Sent'];
 			$data['total_qsl_rcvd'] = $QSLStatsBreakdownArray['QSL_Received'];

application/controllers/Eqsl.php

@@ -162,6 +162,8 @@ public function export()
 			}
 
 			$rows = '';
+			$successful_uploads = array(); // Collect successful QSO primary keys for batch update
+
 			// Grab the list of QSOs to send information about
 			// perform an HTTP get on each one, and grab the status back
 			$qslsnotsent = $this->eqslmethods_model->eqsl_not_yet_sent();
@@ -172,7 +174,7 @@ public function export()
 				// The station callsign is handled in the ADIF data via eqslqthnickname
 				$adif = $this->generateAdif($qsl, $data);
 
-				$status = $this->uploadQso($adif, $qsl);
+				$status = $this->uploadQso($adif, $qsl, $successful_uploads);
 
 				$timestamp = strtotime($qsl['COL_TIME_ON']);
 				$rows .= "<td>" . date($custom_date_format, $timestamp) . "</td>";
@@ -188,6 +190,13 @@ public function export()
 				$rows .= "<td>" . $status . "</td>";
 			}
 			$rows .= "</tr>";
+
+			// Batch update all successful uploads at the end for better performance
+			if (!empty($successful_uploads)) {
+				$affected_rows = $this->eqslmethods_model->eqsl_mark_sent_batch($successful_uploads);
+				log_message('info', 'eQSL export: Marked ' . $affected_rows . ' QSOs as sent to eQSL');
+			}
+
 			$data['eqsl_table'] = $this->generateResultTable($custom_date_format, $rows);
 		} else {
 			$qslsnotsent = $this->eqslmethods_model->eqsl_not_yet_sent();
@@ -201,7 +210,7 @@ public function export()
 		$this->load->view('interface_assets/footer');
 	}
 
-	function uploadQso($adif, $qsl)
+	function uploadQso($adif, $qsl, &$successful_uploads = null)
 	{
 		$this->load->model('eqslmethods_model');
 		$status = "";
@@ -232,7 +241,14 @@ function uploadQso($adif, $qsl)
 		if ($chi['http_code'] == "200") {
 			if (stristr($result, "Result: 1 out of 1 records added")) {
 				$status = "Sent";
-				$this->eqslmethods_model->eqsl_mark_sent($qsl['COL_PRIMARY_KEY']);
+
+				// If batch array is provided, add to it instead of immediate update
+				if ($successful_uploads !== null) {
+					$successful_uploads[] = $qsl['COL_PRIMARY_KEY'];
+				} else {
+					// Legacy: immediate update (for backward compatibility)
+					$this->eqslmethods_model->eqsl_mark_sent($qsl['COL_PRIMARY_KEY']);
+				}
 			} else {
 				if (stristr($result, "Error: No match on eQSL_User/eQSL_Pswd")) {
 					$this->session->set_flashdata('warning', 'Your eQSL username and/or password is incorrect.');
@@ -246,7 +262,11 @@ function uploadQso($adif, $qsl)
 							$status = "Duplicate";
 
 							# Mark the QSL as sent if this is a dupe.
-							$this->eqslmethods_model->eqsl_mark_sent($qsl['COL_PRIMARY_KEY']);
+							if ($successful_uploads !== null) {
+								$successful_uploads[] = $qsl['COL_PRIMARY_KEY'];
+							} else {
+								$this->eqslmethods_model->eqsl_mark_sent($qsl['COL_PRIMARY_KEY']);
+							}
 						}
 					}
 				}

application/controllers/Hrdlog.php

@@ -48,15 +48,26 @@ function setOptions() {
     /*
      * Function gets all QSOs from given station_id, that are not previously uploaded to hrdlog.
      * Adif is build for each qso, and then uploaded, one at a time
+     * Uses batch fetching to prevent memory exhaustion with large datasets
      */
     function mass_upload_qsos($station_id, $hrdlog_username, $hrdlog_code) {
 	    $i = 0;
-	    $data['qsos'] = $this->logbook_model->get_hrdlog_qsos($station_id);
 	    $errormessages = array();
+	    $batch_size = 1000;
+	    $offset = 0;
+	    $has_more_qsos = true;
 
 	    $this->load->library('AdifHelper');
 
-	    if ($data['qsos']) {
+	    // Process QSOs in batches to prevent memory exhaustion
+	    while ($has_more_qsos) {
+		    $data['qsos'] = $this->logbook_model->get_hrdlog_qsos($station_id, $batch_size, $offset);
+
+		    if (!$data['qsos'] || $data['qsos']->num_rows() == 0) {
+			    $has_more_qsos = false;
+			    break;
+		    }
+
 		    foreach ($data['qsos']->result() as $qso) {
 			    $adif = $this->adifhelper->getAdifLine($qso);
 
@@ -76,26 +87,34 @@ function mass_upload_qsos($station_id, $hrdlog_username, $hrdlog_code) {
 				    log_message('error', 'hrdlog upload stopped for Station_ID: ' . $station_id);
 				    $errormessages[] = $result['message'] . 'Invalid HRDLog-Code, stopped at Call: ' . $qso->COL_CALL . ' Band: ' . $qso->COL_BAND . ' Mode: ' . $qso->COL_MODE . ' Time: ' . $qso->COL_TIME_ON;
 				    $result['status'] = 'Error';
-				    break; /* If key is invalid, immediate stop syncing for more QSOs of this station */
+				    break 2; /* If key is invalid, immediate stop syncing for more QSOs of this station */
 			    } else {
 				    log_message('error', 'hrdlog upload failed for qso: Call: ' . $qso->COL_CALL . ' Band: ' . $qso->COL_BAND . ' Mode: ' . $qso->COL_MODE . ' Time: ' . $qso->COL_TIME_ON);
 				    log_message('error', 'hrdlog upload failed with the following message: ' . $result['message']);
 				    $result['status'] = 'Error';
 				    $errormessages[] = $result['message'] . ' Call: ' . $qso->COL_CALL . ' Band: ' . $qso->COL_BAND . ' Mode: ' . $qso->COL_MODE . ' Time: ' . $qso->COL_TIME_ON;
 			    }
 		    }
-		    if ($i == 0) {
-			    $result['status']='Error';
+
+		    // Check if we got a full batch - if not, we've reached the end
+		    if ($data['qsos']->num_rows() < $batch_size) {
+			    $has_more_qsos = false;
+		    } else {
+			    $offset += $batch_size;
+			    log_message('info', 'HRDLog batch upload: Processed ' . $offset . ' QSOs so far for station_id: ' . $station_id);
 		    }
-		    $result['count'] = $i;
-		    $result['errormessages'] = $errormessages;
-		    return $result;
-	    } else {
-		    $result['status'] = 'Error';
-		    $result['count'] = $i;
-		    $result['errormessages'] = $errormessages;
-		    return $result;
-	    }
+		}
+
+		if ($i > 0) {
+			log_message('info', 'HRDLog upload completed: Total of ' . $i . ' QSOs successfully uploaded for station_id: ' . $station_id);
+		}
+
+		if ($i == 0) {
+			$result['status']='Error';
+		}
+		$result['count'] = $i;
+		$result['errormessages'] = $errormessages;
+		return $result;
     }
 
     /*