From 76ecb7d978c0fe182d2a70b2b2c7ba37620c5bcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20G=C3=BCnther?= <th.guenther@saale-mail.de>
Date: Tue, 5 Mar 2024 22:59:15 +0100
Subject: [PATCH] new navigation tree desing optimization language fixes

---
 Makefile                                      |  4 +-
 assets/wordpress-bdp.css                      | 12 ++++--
 bdp-kompass.php                               |  4 +-
 changelog                                     | 16 ++++++++
 includes/frontend-functions.php               | 37 +++++++++----------
 includes/pre_requires.php                     |  3 +-
 includes/setup.php                            |  2 +-
 info.json                                     | 17 ---------
 info2.json                                    | 17 ---------
 .../Controllers/OptionsPage.php               |  9 +++--
 .../includes/gui_elements.php                 |  2 +
 modules/security/classes/Security.class.php   |  5 ++-
 12 files changed, 61 insertions(+), 67 deletions(-)
 delete mode 100644 info.json
 delete mode 100644 info2.json

diff --git a/Makefile b/Makefile
index 2762041..3771d25 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
 deploy:	bdp-kompass.php
+	msgfmt lang/bdp-kompass_de_DE.po -olang/bdp-kompass-de_DE.mo
 	@php ./.deployment/create_info_json.php $(version)
 	mkdir -p ./.deployment/bdp-kompass/bdp-kompass
 	cp -r * ./.deployment/bdp-kompass/bdp-kompass
@@ -9,4 +10,5 @@ deploy:	bdp-kompass.php
 	cd  ./.deployment/bdp-kompass/ && zip -qr ./bdp-kompass-$(version).zip ./bdp-kompass/
 	lftp -e "put -O / ./.deployment/bdp-kompass/bdp-kompass-$(version).zip; bye" -u "lv-sachsen-main_ftp3,sE&xDXc8za#S" bdp.mein-verein.online
 	rm -rf ./.deployment/bdp-kompass/
-	rm -rf ./.deployment/info.json/
\ No newline at end of file
+	rm -rf ./.deployment/info.json/
+	rm -rf ./info.json
\ No newline at end of file
diff --git a/assets/wordpress-bdp.css b/assets/wordpress-bdp.css
index ab97f67..f6f98bf 100644
--- a/assets/wordpress-bdp.css
+++ b/assets/wordpress-bdp.css
@@ -51,10 +51,13 @@ body {
 #wpfooter {
     padding-left: 150px;
 }
+
+#wpbody {
+    padding-right: 40px;
+}
 #wpbody-content {
     background-color: #ffffff;
-    width: 95%;
-    padding-left: 50px;
+    padding-left: 20px;
     box-shadow: 10px 10px 10px #c0c0c0;
     border-radius: 10px;
     border-width: 1px;
@@ -349,7 +352,7 @@ ul#adminmenu > li.current > a.current:after {
 
 
 .bdp_setting_box {
-    width: 100%;
+    margin-right: 10px;
     background-color: #ffffff;
     padding: 15px;
     border-style: solid;
@@ -374,7 +377,8 @@ ul#adminmenu > li.current > a.current:after {
 
 @media (max-width: 720px) {
     #wpbody {
-        padding-right: 0px;
+        padding-top: 60px;
+        padding-right: 40px !important;
         padding-left: 0px;
     }
 
diff --git a/bdp-kompass.php b/bdp-kompass.php
index c5fb4a3..7dedf6f 100644
--- a/bdp-kompass.php
+++ b/bdp-kompass.php
@@ -2,7 +2,7 @@
 /**
  * Plugin Name:  BdP Kompass
  * Description: Wordpress-Plugin zur Unterstützung von Stämmen im Bund der Pfadfinderinnen und Pfadfinder e.V. zur optimalen Verwaltung eurer Webseite
- * Version: 4.3.1
+ * Version: 4.3.5
  * Tags: bdp, utility, helper
  * Requires at least: 6.0
  * Requires PHP: 8.2
@@ -24,6 +24,7 @@ function bdp_plugin_install() {
 
 
 function bdp_plugin_init() {
+	bdp_kompass_load_plugin_textdomain();
 	Security::ProhibitBots();
 	Security::SetPageFilters();
 
@@ -38,6 +39,7 @@ function bdp_plugin_init() {
 }
 
 add_action('admin_menu', function () {
+	bdp_kompass_load_plugin_textdomain();
 	new OptionsPageAlias();
 });
 
diff --git a/changelog b/changelog
index 6bff3af..3dce1e4 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,19 @@
+<h4>Version 4.3.5</h4>
+     <ul>
+         <li>Translation fixes</li>
+     </ul>
+
+
+<h4>Version 4.3.4</h4>
+     <ul>
+         <li>Optimized menu tree</li>
+     </ul>
+
+<h4>Version 4.3.3</h4>
+     <ul>
+         <li>Bugfix für osobletete Plugins</li>
+     </ul>
+
 <h4>Version 4.3.2</h4>
     <ul>
         <li>Bugfix: Zeitzone in Kalender korrigiert</li>
diff --git a/includes/frontend-functions.php b/includes/frontend-functions.php
index e44b540..3d10c91 100644
--- a/includes/frontend-functions.php
+++ b/includes/frontend-functions.php
@@ -90,31 +90,35 @@ function bdp_add_menu_mein_lv() {
 }
 
 function bdp_add_menu_setup() {
+	add_menu_page(
+		'Benutzer',
+		'Benutzer-Verwaltung',
+		'manage_options',
+		'users.php',
+		'',
+		'dashicons-admin-users',
+		6
+	);
+
+
     add_menu_page(
         'Allgemeine Einstellungen',
         'Webseiten-Setup',
         'manage_options',
-        'users.php',
+        'options-general.php',
         '',
         'dashicons-admin-generic',
         6
     );
 
-    add_submenu_page('users.php',
-        'Allgemeine Einstellungen',
-        'Allgemeine Einstellungen',
-        'manage_options',
-        'options-general.php'
-    );
-
-    add_submenu_page('users.php',
+    add_submenu_page('options-general.php',
         'Design-Einstellungen',
         'Template bearbeiten',
         'manage_options',
         'customize.php?return=/wp-admin/'
     );
 
-    add_submenu_page('users.php',
+    add_submenu_page('options-general.php',
         'plugins',
         'Erweiterungen',
         'manage_options',
@@ -122,28 +126,21 @@ function bdp_add_menu_setup() {
     );
 
 
-    add_submenu_page('users.php',
+    add_submenu_page('options-general.php',
         'themes',
         'Designs',
         'manage_options',
         'themes.php'
     );
 
-	add_submenu_page('users.php',
+
+	add_submenu_page('options-general.php',
 		'Sicherheit',
 		'Webseiten-Sicherheit',
 		'manage_options',
 		'site-health.php'
 	);
 
-	$loginOption = new \Bdp\Modules\LimitLoginAttempts\Controllers\OptionsPage();
-	add_submenu_page('users.php',
-		'Login-Sicherheit',
-		'Login-Sicherheit',
-		'manage_options',
-		BDP_LV_PLUGIN_SLUG . '-limit-login-attempts',
-		[$loginOption, 'limit_login_option_page']
-	);
 }
 
 function bdp_cleanup_menu()
diff --git a/includes/pre_requires.php b/includes/pre_requires.php
index 12dc003..5c0a4af 100644
--- a/includes/pre_requires.php
+++ b/includes/pre_requires.php
@@ -3,4 +3,5 @@ require_once (ABSPATH . '/wp-admin/includes/plugin.php');
 require_once (ABSPATH . '/wp-admin/includes/class-wp-filesystem-base.php');
 require_once (ABSPATH . '/wp-admin/includes/class-wp-filesystem-direct.php');
 require_once (ABSPATH . '/wp-includes/pluggable.php');
-require_once (ABSPATH . '/wp-admin/includes/template.php');
\ No newline at end of file
+require_once (ABSPATH . '/wp-admin/includes/template.php');
+require_once (ABSPATH . '/wp-admin/includes/file.php');
\ No newline at end of file
diff --git a/includes/setup.php b/includes/setup.php
index ca1e6a2..dd90c19 100644
--- a/includes/setup.php
+++ b/includes/setup.php
@@ -32,7 +32,7 @@ bdp_create_menu_structure();
 
 
 function bdp_kompass_load_plugin_textdomain() {
-	load_textdomain( BDP_LV_PLUGIN_SLUG, BDP_LV_PLUGIN_DIR . '/lang/' . BDP_LV_PLUGIN_SLUG . '_' . get_locale() . '.mo' );
+	load_textdomain( BDP_LV_PLUGIN_SLUG, BDP_LV_PLUGIN_DIR . '/lang/' . BDP_LV_PLUGIN_SLUG . '-' . get_locale() . '.mo' );
 }
 
 
diff --git a/info.json b/info.json
deleted file mode 100644
index 5dcba19..0000000
--- a/info.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "name": "BdP Kompass",
-    "slug": "bdp-kompass",
-    "author": "Thomas Günther",
-    "author_profile": "https://sachsen.pfadfinden.de",
-    "version": "4.3.2",
-    "download_url": "http://lv-sachsen-main.bdp.mein-verein.online/wordpress/bdp-kompass-4.3.2.zip",
-    "requires": "6.0",
-    "tested": "6.5",
-    "requires_php": "8.2",
-    "last_updated": "02.03.2024 17:02:00",
-    "sections": {
-        "description": "Wordpress-Plugin zur Unterstützung von Stämmen im Bund der Pfadfinderinnen und Pfadfinder e.V. zur optimalen Verwaltung eurer Webseite",
-        "installation": "Bitte wendet euch an den LB IT, falls ihr zur Installation oder zu Updates Fragen habt.",
-        "changelog": "<h4>Version 4.3.2</h4><ul><li>Bugfix: Zeitzone in Kalender korrigiert</li></ul><h4>Version 4.3.1</h4><ul><li>Mehrsprachigkeit unterstützt</li><li>Unterstützung für Smartphones</li></ul><h4>Version 4.2.1</h4><ul><li>Erweiterte Sicherheitsfunktionen implemntiert</li><li>Passwort-Policies implementiert</li><li>Integration von Limit Login Attempts (classic)</li><li>Integration von WPS Hide Login</li></ul><h4>Version 4.1.1</h4><ul><li>Erster release des Plugins</li></ul>"
-    }
-}
\ No newline at end of file
diff --git a/info2.json b/info2.json
deleted file mode 100644
index 98d06df..0000000
--- a/info2.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "name": "BdP Kompass",
-    "slug": "bdp-kompass",
-    "author": "Thomas Günther",
-    "author_profile": "https://sachsen.pfadfinden.de",
-    "version": "4.3.2",
-    "download_url": "http://lv-sachsen-main.bdp.mein-verein.online/wordpress/bdp-kompass-4.3.2.zip",
-    "requires": "6.0",
-    "tested": "6.5",
-    "requires_php": "8.2",
-    "last_updated": "02.03.2024 16:51:00",
-    "sections": {
-        "description": "Wordpress-Plugin zur Unterstützung von Stämmen im Bund der Pfadfinderinnen und Pfadfinder e.V. zur optimalen Verwaltung eurer Webseite",
-        "installation": "Bitte wendet euch an den LB IT, falls ihr zur Installation oder zu Updates Fragen habt.",
-        "changelog": "<h4>Version 4.3.1</h4><ul><li>Mehrsprachrigkeit unterstütz</li><li>Unterstützung für Smartphones</li></ul><h4>Version 4.2.1</h4><ul><li>Erweiterte Sicherheitsfunktionen implemntiert</li><li>Passwort-Policies implementiert</li><li>Integration von Limit Login Attempts (classic)</li><li>Integration von WPS Hide Login</li></ul><h4>Version 4.1.1</h4><ul><li>Erster release des Plugins</li></ul>"
-    }
-}
\ No newline at end of file
diff --git a/modules/LimitLoginAttempts/Controllers/OptionsPage.php b/modules/LimitLoginAttempts/Controllers/OptionsPage.php
index 7b7dc50..f4ae80b 100644
--- a/modules/LimitLoginAttempts/Controllers/OptionsPage.php
+++ b/modules/LimitLoginAttempts/Controllers/OptionsPage.php
@@ -2,14 +2,13 @@
 
 namespace Bdp\Modules\LimitLoginAttempts\Controllers;
 
-
 class OptionsPage
 {
     public function __construct()
     {
         add_options_page(BDP_LV_PLUGIN_SLUG . '-limit-login-attempts',
             __('Login-Protection', BDP_LV_PLUGIN_SLUG),
-            'site-health.php',
+            'manage_options',
             BDP_LV_PLUGIN_SLUG . '-limit-login-attempts',
             [$this, 'limit_login_option_page'],2048);
     }
@@ -46,6 +45,7 @@ class OptionsPage
 
     public function getBlockedIps()
     {
+	    bdp_kompass_load_plugin_textdomain();
         $ips = '';
         foreach (get_option('kompass_limit_login_lockouts', []) as $ip => $blockedUntil) {
             $ips .= '<tr style="vertical-align: top;">' .
@@ -58,7 +58,7 @@ class OptionsPage
             } else {
                 $ips .= '<td style="padding-right: 50px;">' . date('d.m.Y', $blockedUntil) . '<br />' . date('H:i', $blockedUntil) . ' Uhr</td>' .
                     '<td>
-                                         <a href="admin.php?page=kompass-limit-login-attempts&tab=tab4&action=release&ip=' .
+                                         <a href="admin.php?page=bdp-kompass-limit-login-attempts&tab=tab4&action=release&ip=' .
                     base64_encode($ip) . '">' . __('Release ip address', BDP_LV_PLUGIN_SLUG) . '</a><br />
                                         <a href="admin.php?page=bdp-kompass-limit-login-attempts&tab=tab4&action=toBlock&ip=' .
                     base64_encode($ip) . '">' . __('Add ip address to blocklist', BDP_LV_PLUGIN_SLUG) . '</a><br />
@@ -72,7 +72,7 @@ class OptionsPage
 
     public function limit_login_option_page() {
         global $errors;
-
+	    bdp_kompass_load_plugin_textdomain();
         $showMessage = null;
 
         if (isset($_POST['update_options'])) {
@@ -109,6 +109,7 @@ class OptionsPage
                 $tab = 'tab3';
             }
         }
+	    bdp_kompass_load_plugin_textdomain();
 
         ?>
 
diff --git a/modules/LimitLoginAttempts/includes/gui_elements.php b/modules/LimitLoginAttempts/includes/gui_elements.php
index 24d9a35..39ccedd 100644
--- a/modules/LimitLoginAttempts/includes/gui_elements.php
+++ b/modules/LimitLoginAttempts/includes/gui_elements.php
@@ -26,6 +26,8 @@ function _kompass_limit_logins_settings_checkbox_callback(array $args) {
     kompass_print_checkbox($args['setting']);
 }
 
+
+bdp_kompass_load_plugin_textdomain();
 add_settings_section(
     'custom_settings_section',
     __('Options', BDP_LV_PLUGIN_SLUG),
diff --git a/modules/security/classes/Security.class.php b/modules/security/classes/Security.class.php
index c4973dc..a44806f 100644
--- a/modules/security/classes/Security.class.php
+++ b/modules/security/classes/Security.class.php
@@ -104,7 +104,10 @@ class Security
 		}
 
 		if ( str_contains( $_SERVER['REQUEST_URI'], $hideLogin ) !== false ) {
-			$user_login              = '';
+			$user_login  = '';
+			if (!isset($error)) {
+				$error = '';
+			}
 			$_REQUEST['redirect_to'] = 'interner-bereich';
 			require_once 'wp-login.php';
 			die();