Merge branch 'magicbug:dev' into dev

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';
+

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';

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':

application/views/dashboard/index.php

@@ -288,12 +288,12 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
         </tr>
 
         <tr>
-            <td width="50%">Worked</td>
+            <td width="50%"><?php echo lang('general_word_worked'); ?></td>
             <td width="50%"><?php echo $vucc['All']['worked']; ?></td>
         </tr>
 
         <tr>
-            <td width="50%">Confirmed</td>
+            <td width="50%"><?php echo lang('general_word_confirmed'); ?></td>
             <td width="50%"><?php echo $vucc['All']['confirmed']; ?></td>
         </tr>
 

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();
 }

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,
+			array(
-			$this->_config['cookie_path'],
+				'expires' => 1,
-			$this->_config['cookie_domain'],
+				'path' => $this->_config['cookie_path'],
-			$this->_config['cookie_secure'],
+				'domain' => $this->_config['cookie_domain'],
-			TRUE
+				'secure' => $this->_config['cookie_secure'],
+				'httponly' => TRUE,
+				'samesite' => $this->_config['cookie_samesite']
+			)
 		);
 	}