From 5da109c15f215ee31079364994eb5b3830f0c534 Mon Sep 17 00:00:00 2001 From: phl0 Date: Thu, 28 Sep 2023 15:36:10 +0200 Subject: [PATCH 1/6] Backport cookie destroy function gfrom CI 3 --- system/libraries/Session/Session_driver.php | 26 ++++++++++++++++----- 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/system/libraries/Session/Session_driver.php b/system/libraries/Session/Session_driver.php index 734b6e05..d65c1381 100644 --- a/system/libraries/Session/Session_driver.php +++ b/system/libraries/Session/Session_driver.php @@ -139,14 +139,28 @@ abstract class CI_Session_driver implements SessionHandlerInterface { */ protected function _cookie_destroy() { + if ( ! is_php('7.3')) + { + $header = 'Set-Cookie: '.$this->_config['cookie_name'].'='; + $header .= '; Expires='.gmdate('D, d-M-Y H:i:s T', 1).'; Max-Age=-1'; + $header .= '; Path='.$this->_config['cookie_path']; + $header .= ($this->_config['cookie_domain'] !== '' ? '; Domain='.$this->_config['cookie_domain'] : ''); + $header .= ($this->_config['cookie_secure'] ? '; Secure' : '').'; HttpOnly; SameSite='.$this->_config['cookie_samesite']; + header($header); + return; + } + return setcookie( $this->_config['cookie_name'], - NULL, - 1, - $this->_config['cookie_path'], - $this->_config['cookie_domain'], - $this->_config['cookie_secure'], - TRUE + '', + array( + 'expires' => 1, + 'path' => $this->_config['cookie_path'], + 'domain' => $this->_config['cookie_domain'], + 'secure' => $this->_config['cookie_secure'], + 'httponly' => TRUE, + 'samesite' => $this->_config['cookie_samesite'] + ) ); } From 4233895432f23141c60843ee05e0868435cb2733 Mon Sep 17 00:00:00 2001 From: int2001 Date: Sat, 30 Sep 2023 10:49:19 +0000 Subject: [PATCH 2/6] Fix Gridsearch / QSO-Details --- application/models/Logbook_model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index c22f063b..355545c0 100755 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -352,7 +352,7 @@ class Logbook_model extends CI_Model { if ($searchmode == 'activated') { $this->db->where("station_gridsquare like '%" . $searchphrase . "%'"); } else { - $this->db->where("(COL_GRIDSQUARE like '%" . $searchphrase . "%' OR COL_VUCC_GRIDS like'%" . $searchphrase ."%')"); + $this->db->where("(COL_GRIDSQUARE like '" . $searchphrase . "%' OR COL_VUCC_GRIDS like '" . $searchphrase ."%')"); } break; case 'CQZone': From 6df75c356265420e720640a829b9a8f3358451e1 Mon Sep 17 00:00:00 2001 From: int2001 Date: Sat, 30 Sep 2023 11:59:52 +0000 Subject: [PATCH 3/6] Readded % for VUCC-Grids (because of multi-grids / confluence-points) --- application/models/Logbook_model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index 355545c0..bc9d68d9 100755 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -352,7 +352,7 @@ class Logbook_model extends CI_Model { if ($searchmode == 'activated') { $this->db->where("station_gridsquare like '%" . $searchphrase . "%'"); } else { - $this->db->where("(COL_GRIDSQUARE like '" . $searchphrase . "%' OR COL_VUCC_GRIDS like '" . $searchphrase ."%')"); + $this->db->where("(COL_GRIDSQUARE like '" . $searchphrase . "%' OR COL_VUCC_GRIDS like '%" . $searchphrase ."%')"); } break; case 'CQZone': From 7913aeb555720fae3dfdd5ec1c0be477e1185e1b Mon Sep 17 00:00:00 2001 From: HB9HIL <80885850+HB9HIL@users.noreply.github.com> Date: Mon, 2 Oct 2023 09:04:41 +0200 Subject: [PATCH 4/6] Update index.php Add multilanguage-support to VUCC Overview on Dashboard --- application/views/dashboard/index.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/views/dashboard/index.php b/application/views/dashboard/index.php index 16243236..38ad16c9 100644 --- a/application/views/dashboard/index.php +++ b/application/views/dashboard/index.php @@ -288,12 +288,12 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) { - Worked + - Confirmed + From df688cfcd4141d28b3e8cfe00c6a9b35e57d32e1 Mon Sep 17 00:00:00 2001 From: int2001 Date: Mon, 2 Oct 2023 11:46:01 +0000 Subject: [PATCH 5/6] Fix contestlog-reload on Fieldreset --- assets/js/sections/contesting.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/assets/js/sections/contesting.js b/assets/js/sections/contesting.js index 1b820aa9..248d85e8 100644 --- a/assets/js/sections/contesting.js +++ b/assets/js/sections/contesting.js @@ -257,7 +257,7 @@ function checkIfWorkedBefore() { } } -function reset_log_fields() { +async function reset_log_fields() { $('#name').val(""); $('.callsign-suggestions').text(""); $('#callsign').val(""); @@ -269,6 +269,7 @@ function reset_log_fields() { setRst($("#mode").val()); $('#callsign_info').text(""); + await refresh_qso_table(sessiondata); var qTable = $('.qsotable').DataTable(); qTable.search('').draw(); } From 2ad0f0c395351c11db3168173cf7e4300b4c9495 Mon Sep 17 00:00:00 2001 From: int2001 Date: Mon, 2 Oct 2023 13:10:49 +0000 Subject: [PATCH 6/6] Lang for admin_user_accounts was missing in English/German --- application/language/english/admin_lang.php | 2 ++ application/language/german/admin_lang.php | 1 + 2 files changed, 3 insertions(+) diff --git a/application/language/english/admin_lang.php b/application/language/english/admin_lang.php index 5b3568c8..1bc61a14 100644 --- a/application/language/english/admin_lang.php +++ b/application/language/english/admin_lang.php @@ -16,3 +16,5 @@ $lang['admin_options'] = 'Options'; $lang['admin_create_user'] = 'Create user'; $lang['admin_delete'] = 'Delete'; $lang['admin_edit'] = 'Edit'; +$lang['admin_user_accounts'] = 'User Accounts'; + diff --git a/application/language/german/admin_lang.php b/application/language/german/admin_lang.php index ca636b4a..bf7774ff 100644 --- a/application/language/german/admin_lang.php +++ b/application/language/german/admin_lang.php @@ -16,3 +16,4 @@ $lang['admin_options'] = 'Optionen'; $lang['admin_create_user'] = 'Benutzer anlegen'; $lang['admin_delete'] = 'Löschen'; $lang['admin_edit'] = 'Editieren'; +$lang['admin_user_accounts'] = 'Benutzerkonten';