From e233f6d29ab533906c1dea5763a8227a7f2bb5f9 Mon Sep 17 00:00:00 2001
From: Massimo Melina <a@rejetto.com>
Date: Tue, 4 Aug 2020 22:39:02 +0200
Subject: [PATCH] fix: search and archive recently broken

---
 default.tpl | 10 +++++++---
 main.pas    |  4 ++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/default.tpl b/default.tpl
index 077a53c..935b3d2 100644
--- a/default.tpl
+++ b/default.tpl
@@ -227,6 +227,10 @@ $domReady(()=>{
 $on('#search-panel', { submit(ev) {
 	var f = $form(ev.target)
 	var s = f.search
+	if (!s) {
+		showError(`{.!Search field is mandatory.}`)
+		return false
+	}
 	var folder = ''
 	var ps = []
 	switch (f.where) {
@@ -733,7 +737,7 @@ function $form(form, field) {
 		return form.elements.namedItem(field).value
 	let ret = {}
 	for (let e of form.elements)
-		if (e.name) {
+		if (e.name && (e.type !== 'radio' || e.checked)) {
 			let v = e.value
 			if (field === false)
 				v = v.trim()
@@ -1081,7 +1085,7 @@ function toggleSelection() {
     $toggle('selection-panel')
 	if (multiSelection = !multiSelection) {
 		let base = $create('input.selector', { a:{type:'checkbox'} })
-		$msel('.item-selectable a', e=> // having the checkbox inside the A element will put it on the same line of A even with long A, otherwise A will start on a new line.
+		$msel('.item-selectable .item-link a', e=> // having the checkbox inside the A element will put it on the same line of A even with long A, otherwise A will start on a new line.
 			e.append(base.cloneNode()) )
 	}
 	else
@@ -1340,7 +1344,7 @@ $domReady(()=>{
     $toggle('delete-selection', $sel('.can-delete'))
     $click('#archive', ()=>
         mustSelect() && ask("{.!Downloading many files as archive can be a lengthy operation, and the result is a TAR file. Continue?.}", ()=>
-            submit({ selection: getSelectedItemsName() }, "{.get|url|mode=archive|recursive.}") ))
+            submit({ selection: getSelectedItemsName() }, "?mode=archive") ))
 
     $msel('#files .cannot-access .item-link img', x=>
 		x.insertAdjacentElement('afterend', $icon('lock', "{.!No access.}") ))
diff --git a/main.pas b/main.pas
index 37e45ce..5b5c5e4 100644
--- a/main.pas
+++ b/main.pas
@@ -35,8 +35,8 @@ uses
   HSlib, traylib, monoLib, progFrmLib, classesLib;
 
 const
-  VERSION = '2.4.0 RC7';
-  VERSION_BUILD = '319';
+  VERSION = '2.4.0 RC8';
+  VERSION_BUILD = '320';
   VERSION_STABLE = {$IFDEF STABLE } TRUE {$ELSE} FALSE {$ENDIF};
   CURRENT_VFS_FORMAT :integer = 1;
   CRLF = #13#10;