From 2987ae5a053ac62f5a19b53834c5ccba83ce6420 Mon Sep 17 00:00:00 2001
From: Michael Kaufmann <d00p@froxlor.org>
Date: Mon, 17 Oct 2022 08:52:58 +0200
Subject: [PATCH] respect newsfeed-visibility-settings; fix typo for saving
 column-visibility in apikeys; added back-to-overview button in cronjobs-edit;
 strings fixes

Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
---
 api_keys.php                                              | 2 +-
 lib/formfields/admin/cronjobs/formfield.cronjobs_edit.php | 1 +
 lng/de.lng.php                                            | 1 +
 lng/en.lng.php                                            | 1 +
 templates/Froxlor/user/index.html.twig                    | 2 ++
 5 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/api_keys.php b/api_keys.php
index bfedf322..728b1c22 100644
--- a/api_keys.php
+++ b/api_keys.php
@@ -165,7 +165,7 @@ $collection = [
 $tpl = 'user/table.html.twig';
 
 UI::view($tpl, [
-	'listing' => Listing::formatFromArray($collection, $apikeys_list_data['apikeys_list'], 'apikyes_list'),
+	'listing' => Listing::formatFromArray($collection, $apikeys_list_data['apikeys_list'], 'apikeys_list'),
 	'actions_links' => (int)$userinfo['api_allowed'] == 1 ? [
 		[
 			'href' => $linker->getLink(['section' => 'index', 'page' => $page, 'action' => 'add']),
diff --git a/lib/formfields/admin/cronjobs/formfield.cronjobs_edit.php b/lib/formfields/admin/cronjobs/formfield.cronjobs_edit.php
index ec8cf574..49a35b32 100644
--- a/lib/formfields/admin/cronjobs/formfield.cronjobs_edit.php
+++ b/lib/formfields/admin/cronjobs/formfield.cronjobs_edit.php
@@ -27,6 +27,7 @@ return [
 	'cronjobs_edit' => [
 		'title' => lng('admin.cronjob_edit'),
 		'image' => 'fa-solid fa-clock-rotate-left',
+		'self_overview' => ['section' => 'cronjobs', 'page' => 'overview'],
 		'sections' => [
 			'section_a' => [
 				'title' => lng('cronjob.cronjobsettings'),
diff --git a/lng/de.lng.php b/lng/de.lng.php
index 1499b22f..272f4a54 100644
--- a/lng/de.lng.php
+++ b/lng/de.lng.php
@@ -2025,6 +2025,7 @@ Vielen Dank, Ihr Administrator',
 		],
 		'createstdsubdom_default' => [
 			'title' => 'Standardwert für "Standardsubdomain anlegen" bei Erstellung eines Kunden',
+			'description' => '',
 		],
 		'froxlorusergroup' => [
 			'title' => 'Benutzerdefinierte Gruppe für alle Kunden-Benutzer',
diff --git a/lng/en.lng.php b/lng/en.lng.php
index e89c545b..7d440122 100644
--- a/lng/en.lng.php
+++ b/lng/en.lng.php
@@ -2142,6 +2142,7 @@ Yours sincerely, your administrator',
 		],
 		'createstdsubdom_default' => [
 			'title' => 'Preselected value for "Create standard subdomain" when creating a customer',
+			'description' => '',
 		],
 		'froxlorusergroup' => [
 			'title' => 'Custom system group for all customer users',
diff --git a/templates/Froxlor/user/index.html.twig b/templates/Froxlor/user/index.html.twig
index 41d1eb22..703a2407 100644
--- a/templates/Froxlor/user/index.html.twig
+++ b/templates/Froxlor/user/index.html.twig
@@ -279,6 +279,7 @@
 				</div>
 			{% endif %}
 
+			{% if (get_setting('admin.show_news_feed') == 1 and userinfo.adminsession == 1) or (get_setting('customer.show_news_feed') == 1 and userinfo.adminsession == 0)  %}
 			<div id="newsfeed" class="card">
 				<div class="card-header">
 					<i class="fa-solid fa-info-circle me-1"></i>
@@ -295,6 +296,7 @@
 					</div>
 				</div>
 			</div>
+			{% endif %}
 		</div>
 	</div>
 {% endblock %}