From 628fa0791edb8e37213a633e56a8b96c31440674 Mon Sep 17 00:00:00 2001
From: Banana <mail@bananas-playground.net>
Date: Sun, 25 Feb 2024 11:35:59 +0100
Subject: [PATCH] some fixes

---
 .../98/managecolletions/managecolletions.html | 72 ++++++++++---------
 .../view/98/manageentry/field-upload.html     |  2 +-
 .../managecolletions/managecolletions.html    |  5 +-
 .../managecolletions/managecolletions.php     |  1 -
 .../default/manageentry/field-upload.html     |  2 +-
 5 files changed, 42 insertions(+), 40 deletions(-)

diff --git a/webclient/view/98/managecolletions/managecolletions.html b/webclient/view/98/managecolletions/managecolletions.html
index ee6e1c6..8eadd6f 100644
--- a/webclient/view/98/managecolletions/managecolletions.html
+++ b/webclient/view/98/managecolletions/managecolletions.html
@@ -1,5 +1,39 @@
 <h3>Manage your collections</h3>
 <h4>Add or modify a collection</h4>
+
+<h4>Available collections</h4>
+<div class="sunken-panel">
+	<table width="100%">
+		<thead>
+		<tr>
+			<th width="200px">Name</th>
+			<th>Created</th>
+			<th>Description</th>
+			<th>Owner</th>
+			<th>Group</th>
+			<th>Rights</th>
+			<th>Collection</th>
+			<th>Fields</th>
+		</tr>
+		</thead>
+		<tbody>
+		<?php foreach($TemplateData['existingCollections'] as $k=>$v) { ?>
+		<tr>
+			<td><?php echo $v['name']; ?></td>
+			<td><?php echo $v['created']; ?></td>
+			<td><?php echo $v['description']; ?></td>
+			<td><?php echo $v['username']; ?></td>
+			<td><?php echo $v['groupname']; ?></td>
+			<td><?php echo $v['rights']; ?></td>
+			<td><a href="index.php?p=managecolletions&m=edit&id=<?php echo $k; ?>">Edit</a></td>
+			<td><a href="index.php?p=managecollectionfields&id=<?php echo $k; ?>">Edit</a></td>
+		</tr>
+		<?php } ?>
+		</tbody>
+	</table>
+</div>
+<p>&nbsp;</p>
+
 <blockquote>
 	Any default field or any option which needs a field, get its values after the fields are configured.
 </blockquote>
@@ -20,9 +54,9 @@
 		<label for="defaultSearchField">Default global search field</label>
 		<select id="defaultSearchField" name="fdata[defaultSearchField]">
 			<option value="">Please select</option>
-			<?php foreach($TemplateData['simpleSearchFields'] as $k=>$v) { ?>
+			<?php foreach($TemplateData['simpleSearchFields'] as $k=>$v) { var_dump($v); ?>
 			<option value="<?php echo $v['identifier']; ?>"
-			<?php if(isset($TemplateData['editData']['defaultSearchField'][$v['identifier']])) echo 'selected'; ?>
+				<?php echo ($TemplateData['editData']['defaultSearchField'] ?? '') == $v['identifier'] ? 'selected' : ''; ?>
 			><?php echo $v['displayname']; ?> (<?php echo $v['type']; ?>)</option>
 			<?php } ?>
 		</select>
@@ -49,7 +83,7 @@
 			<option value="">Please select</option>
 			<?php foreach($TemplateData['simpleSearchFields'] as $k=>$v) { ?>
 			<option value="<?php echo $v['identifier']; ?>"
-			<?php if(isset($TemplateData['editData']['defaultSortField'][$v['identifier']])) echo 'selected'; ?>
+				<?php echo ($TemplateData['editData']['defaultSortField'] ?? '') == $v['identifier'] ? 'selected' : ''; ?>
 			><?php echo $v['displayname']; ?> (<?php echo $v['type']; ?>)</option>
 			<?php } ?>
 		</select>
@@ -184,35 +218,3 @@
 		<input type="submit" name="submitForm" value="Save" />
 	</div>
 </form>
-
-<h4>Available collections</h4>
-<div class="sunken-panel">
-	<table width="100%">
-		<thead>
-			<tr>
-				<th width="200px">Name</th>
-				<th>Created</th>
-				<th>Description</th>
-				<th>Owner</th>
-				<th>Group</th>
-				<th>Rights</th>
-				<th>Collection</th>
-				<th>Fields</th>
-			</tr>
-		</thead>
-		<tbody>
-			<?php foreach($TemplateData['existingCollections'] as $k=>$v) { ?>
-			<tr>
-				<td><?php echo $v['name']; ?></td>
-				<td><?php echo $v['created']; ?></td>
-				<td><?php echo $v['description']; ?></td>
-				<td><?php echo $v['username']; ?></td>
-				<td><?php echo $v['groupname']; ?></td>
-				<td><?php echo $v['rights']; ?></td>
-				<td><a href="index.php?p=managecolletions&m=edit&id=<?php echo $k; ?>">Edit</a></td>
-				<td><a href="index.php?p=managecollectionfields&id=<?php echo $k; ?>">Edit</a></td>
-			</tr>
-			<?php } ?>
-		</tbody>
-	</table>
-</div>
diff --git a/webclient/view/98/manageentry/field-upload.html b/webclient/view/98/manageentry/field-upload.html
index 9646afb..c8a448b 100644
--- a/webclient/view/98/manageentry/field-upload.html
+++ b/webclient/view/98/manageentry/field-upload.html
@@ -6,7 +6,7 @@
 		/>
 
 		<?php if(isset($TemplateData['editData'][$field['identifier']])) { ?>
-		<?php echo '<a href="'.$TemplateData['storagePath'].'/'.$TemplateData['editData'][$field['identifier']] ?? ''.'">'.$TemplateData['editData'][$field['identifier']] ?? ''.'</a>'; ?>
+		<a target="_blank" href="<?php echo $TemplateData['storagePath'].'/'.$TemplateData['editData'][$field['identifier']]; ?>"><?php echo $TemplateData['editData'][$field['identifier']]; ?></a>
 		<input type="checkbox" value="<?php echo $TemplateData['editData'][$field['identifier']] ?? ''; ?>"
 			   name="fdata[<?php echo $field['identifier']; ?>_delete]"
 			   title="Delete"
diff --git a/webclient/view/default/managecolletions/managecolletions.html b/webclient/view/default/managecolletions/managecolletions.html
index c45e434..725e215 100644
--- a/webclient/view/default/managecolletions/managecolletions.html
+++ b/webclient/view/default/managecolletions/managecolletions.html
@@ -30,8 +30,9 @@
 						<option value="">Please select</option>
 						<?php foreach($TemplateData['simpleSearchFields'] as $k=>$v) { ?>
 						<option value="<?php echo $v['identifier']; ?>"
-						<?php ($TemplateData['editData']['defaultSearchField'] ?? '') == $v['identifier'] ? 'selected' : ''; ?>
-						><?php echo $v['displayname']; ?> (<?php echo $v['type']; ?>)</option>
+							<?php echo ($TemplateData['editData']['defaultSearchField'] ?? '') == $v['identifier'] ? 'selected' : ''; ?>
+						>
+						<?php echo $v['displayname']; ?> (<?php echo $v['type']; ?>)</option>
 						<?php } ?>
 					</select>
 					<small>
diff --git a/webclient/view/default/managecolletions/managecolletions.php b/webclient/view/default/managecolletions/managecolletions.php
index d8d83bd..68e85fb 100644
--- a/webclient/view/default/managecolletions/managecolletions.php
+++ b/webclient/view/default/managecolletions/managecolletions.php
@@ -144,6 +144,5 @@ if(isset($_POST['submitForm'])) {
 				}
 			}
 		}
-
 	}
 }
diff --git a/webclient/view/default/manageentry/field-upload.html b/webclient/view/default/manageentry/field-upload.html
index f5dca9d..9e6f6e7 100644
--- a/webclient/view/default/manageentry/field-upload.html
+++ b/webclient/view/default/manageentry/field-upload.html
@@ -6,7 +6,7 @@
 		>
 		<?php if(isset($TemplateData['editData'][$field['identifier']])) { ?>
 		<div uk-lightbox>
-			<?php echo '<a href="'.$TemplateData['storagePath'].'/'.$TemplateData['editData'][$field['identifier']] ?? ''.'">'.$TemplateData['editData'][$field['identifier']] ?? ''.'</a>'; ?>
+			<a href="<?php echo $TemplateData['storagePath'].'/'.$TemplateData['editData'][$field['identifier']]; ?>" target="_blank"><?php echo $TemplateData['editData'][$field['identifier']]; ?></a>
 			<input type="checkbox" value="<?php echo $TemplateData['editData'][$field['identifier']] ?? ''; ?>"
 				   name="fdata[<?php echo $field['identifier']; ?>_delete]"
 				   title="Delete"
-- 
2.39.5