From 6330d5df77f7e5804e0afed53ae057504d27f2ef Mon Sep 17 00:00:00 2001
From: Patrick Burns <burnsoft@gmail.com>
Date: Tue, 2 Apr 2024 09:51:10 -0500
Subject: [PATCH] added pagination to visitor page only if the public search
 option is enabled

---
 application/controllers/Visitor.php | 39 +++++++++++++++++++++++++++--
 application/views/visitor/index.php | 11 +++++---
 2 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/application/controllers/Visitor.php b/application/controllers/Visitor.php
index 92fe41d3..82a278ac 100644
--- a/application/controllers/Visitor.php
+++ b/application/controllers/Visitor.php
@@ -75,6 +75,38 @@ class Visitor extends CI_Controller {
 
                 $this->load->model('logbook_model');
 
+				// Only load, config, and init pagination if public search is enabled
+				if ($this ->public_search_enabled($public_slug)) {
+					$this->load->library('pagination');
+				
+					//Pagination config
+					$config['base_url'] = base_url().'index.php/visitor/'. $public_slug . '/index';
+					$config['total_rows'] = $this->logbook_model->total_qsos($logbooks_locations_array);
+					$config['per_page'] = '25';
+					$config['num_links'] = $this->logbook_model->total_qsos($logbooks_locations_array) / 25;
+					$config['full_tag_open'] = '<ul class="pagination">';
+					$config['full_tag_close'] = '</ul>';
+					$config['attributes'] = ['class' => 'page-link'];
+					$config['first_link'] = false;
+					$config['last_link'] = false;
+					$config['first_tag_open'] = '<li class="page-item">';
+					$config['first_tag_close'] = '</li>';
+					$config['prev_link'] = '&laquo';
+					$config['prev_tag_open'] = '<li class="page-item">';
+					$config['prev_tag_close'] = '</li>';
+					$config['next_link'] = '&raquo';
+					$config['next_tag_open'] = '<li class="page-item">';
+					$config['next_tag_close'] = '</li>';
+					$config['last_tag_open'] = '<li class="page-item">';
+					$config['last_tag_close'] = '</li>';
+					$config['cur_tag_open'] = '<li class="page-item active"><a href="#" class="page-link">';
+					$config['cur_tag_close'] = '<span class="visually-hidden">(current)</span></a></li>';
+					$config['num_tag_open'] = '<li class="page-item">';
+					$config['num_tag_close'] = '</li>';
+
+					$this->pagination->initialize($config);
+				}
+
                 // Public visitor so no QRA to setup
                 $data['qra'] = "none";
 
@@ -107,8 +139,11 @@ class Visitor extends CI_Controller {
 
                 $data['total_lotw_sent'] = $QSLStatsBreakdownArray['LoTW_Sent'];
                 $data['total_lotw_rcvd'] = $QSLStatsBreakdownArray['LoTW_Received'];
-
-                $data['last_five_qsos'] = $this->logbook_model->get_last_qsos('18', $logbooks_locations_array);
+				
+				// If public search is enabled, show paginated results, otherwise show last 18 qsos
+				$data['results'] = $this->public_search_enabled($public_slug) 
+					? $this->logbook_model->get_qsos($config['per_page'], $this->uri->segment(4), $logbooks_locations_array)
+					: $this->logbook_model->get_last_qsos('18', $logbooks_locations_array);
 
                 $data['page_title'] = "Dashboard";
                 $data['slug'] = $public_slug;
diff --git a/application/views/visitor/index.php b/application/views/visitor/index.php
index 898e9fcd..6a191cce 100644
--- a/application/views/visitor/index.php
+++ b/application/views/visitor/index.php
@@ -79,13 +79,13 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
 			</thead>
 
 			<?php
+			
 			$i = 0;
-			if(!empty($last_five_qsos) > 0) {
-			foreach ($last_five_qsos->result() as $row) { ?>
+			if(!empty($results) > 0) {
+			foreach ($results->result() as $row) { ?>
 				<?php  echo '<tr class="tr'.($i & 1).'">'; ?>
 
 					<?php
-
 					// Get Date format
 					if($this->session->userdata('user_date_format')) {
 						// If Logged in and session exists
@@ -114,6 +114,11 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
 				</tr>
 			<?php $i++; } } ?>
 		</table>
+		<?php if($this->CI->public_search_enabled($slug)) { ?>
+			<div class="pagination-links">
+				<?php echo $this->pagination->create_links(); ?>
+			</div>
+		<?php } ?>
 	</div>
   </div>