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';
diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php
index c22f063b..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':
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 |
+ |
|
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();
}
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']
+ )
);
}