From d4c7bbc183e017b592fefca3ac8da31a40ab1d94 Mon Sep 17 00:00:00 2001 From: Marvin Flock Date: Mon, 10 Mar 2025 19:37:10 +0100 Subject: [PATCH 1/4] fix: replace is_array check with actual array --- .../com_sportsmanager/views/sportsmanager/view_admin.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/structure/components/com_sportsmanager/views/sportsmanager/view_admin.php b/src/structure/components/com_sportsmanager/views/sportsmanager/view_admin.php index 624a7d0..134719a 100644 --- a/src/structure/components/com_sportsmanager/views/sportsmanager/view_admin.php +++ b/src/structure/components/com_sportsmanager/views/sportsmanager/view_admin.php @@ -5326,8 +5326,8 @@ class HTML_sportsmanager_admin lizenzen)) ? ' checked': ''; + { + $checked = ($rangliste != null && is_array($rangliste->lizenzen) && in_array($lizenz, $rangliste->lizenzen)) ? ' checked': ''; echo '
'; } ?> From b776cea8264af4e83daef0f56b65d927e3e52424 Mon Sep 17 00:00:00 2001 From: Marvin Flock Date: Mon, 10 Mar 2025 19:38:10 +0100 Subject: [PATCH 2/4] fix: cut bytestring into numeric part --- .../components/com_sportsmanager/tools.php | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/structure/components/com_sportsmanager/tools.php b/src/structure/components/com_sportsmanager/tools.php index 189687f..4e5efd9 100644 --- a/src/structure/components/com_sportsmanager/tools.php +++ b/src/structure/components/com_sportsmanager/tools.php @@ -116,20 +116,19 @@ function setMinMemoryLimit($memDestSize) { } function getBytes($val) { - if (is_numeric($val)) { $val = trim($val); - $last = strtolower($val[strlen($val) - 1]); - switch ($last) { + $numeric = substr($val, 0, strlen($val) -1); + $last = strtolower($val[strlen($val) - 1]); + switch($last) { // The 'G' modifier is available since PHP 5.1.0 case 'g': - $val *= 1024; + $numeric *= 1024; case 'm': - $val *= 1024; + $numeric *= 1024; case 'k': - $val *= 1024; - } - return $val; + $numeric *= 1024; } + return $numeric; } function encrypt($str, $key){ From e5f3d15ac1149d260ff6ead38e9d89ec167dd9f9 Mon Sep 17 00:00:00 2001 From: Marvin Flock Date: Mon, 10 Mar 2025 19:38:42 +0100 Subject: [PATCH 3/4] fix: add missing license fields to database update --- .../components/com_sportsmanager/database.php | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/src/structure/components/com_sportsmanager/database.php b/src/structure/components/com_sportsmanager/database.php index 6926aec..57f6b79 100644 --- a/src/structure/components/com_sportsmanager/database.php +++ b/src/structure/components/com_sportsmanager/database.php @@ -5172,6 +5172,29 @@ function updateDatabase() } } + + if ($datenbank_version < 102) { + $query = "ALTER TABLE #__sportsmanager_rangliste ADD lizenzen TEXT DEFAULT NULL AFTER geschlecht"; + $db->setQuery($query); + if (!$result = $db->execute()) { + die($db->stderr(true)); + } + + $query = "ALTER TABLE #__sportsmanager_spieler ADD lizenz TEXT DEFAULT NULL AFTER nachname"; + $db->setQuery($query); + if (!$result = $db->execute()) { + die($db->stderr(true)); + } + + $query = "UPDATE #__sportsmanager_einstellungen" + . "\n SET wert = '102'" + . "\n WHERE name = 'datenbank_version'"; + $db->setQuery($query); + if (!$result = $db->execute()) { + die($db->stderr(true)); + } + } + if ($termin_aktionen_email_setzen) { $query = "SELECT aktion_user_id, termin_aktion_id" . "\n FROM #__sportsmanager_termin_aktion"; From e725f0fcea4bf221b86bc693227bcfa3de3fed05 Mon Sep 17 00:00:00 2001 From: Marvin Flock Date: Wed, 12 Mar 2025 17:29:22 +0100 Subject: [PATCH 4/4] fix: add missing license fields to install.php, change order of fields --- .../administrator/components/com_sportsmanager/install.php | 4 +++- src/structure/components/com_sportsmanager/database.php | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/structure/administrator/components/com_sportsmanager/install.php b/src/structure/administrator/components/com_sportsmanager/install.php index b57b259..fa7bb19 100644 --- a/src/structure/administrator/components/com_sportsmanager/install.php +++ b/src/structure/administrator/components/com_sportsmanager/install.php @@ -398,6 +398,7 @@ class com_sportsmanagerInstallerScript . "\n `saison_id` int(11) NOT NULL DEFAULT '0'," . "\n `system_id` int(11) NOT NULL DEFAULT '0'," . "\n `streichergebnisse` tinyint(4) DEFAULT NULL," + . "\n `lizenzen` varchar(30) DEFAULT NULL," . "\n `geschlecht` tinyint(4) DEFAULT NULL," . "\n `minalter` tinyint(4) DEFAULT NULL," . "\n `maxalter` tinyint(4) DEFAULT NULL," @@ -583,6 +584,7 @@ class com_sportsmanagerInstallerScript . "\n `email` varchar(64) DEFAULT NULL," . "\n `spielernr` varchar(20) DEFAULT NULL," . "\n `lizenznr` varchar(50) DEFAULT NULL," + . "\n `lizenz` varchar(30) DEFAULT NULL," . "\n `erstmals_gespielt` date DEFAULT NULL," . "\n `zuletzt_gespielt` date DEFAULT NULL," . "\n `pseudonym` varchar(30) DEFAULT NULL," @@ -1085,7 +1087,7 @@ class com_sportsmanagerInstallerScript $db->setQuery( $query ); if (!$result = $db->execute()) { die($db->stderr(true)); } - $query = "INSERT IGNORE #__sportsmanager_einstellungen SET name = 'datenbank_version', wert = '101';"; + $query = "INSERT IGNORE #__sportsmanager_einstellungen SET name = 'datenbank_version', wert = '102';"; $db->setQuery( $query ); if (!$result = $db->execute()) { die($db->stderr(true)); } diff --git a/src/structure/components/com_sportsmanager/database.php b/src/structure/components/com_sportsmanager/database.php index 57f6b79..22490d0 100644 --- a/src/structure/components/com_sportsmanager/database.php +++ b/src/structure/components/com_sportsmanager/database.php @@ -5174,13 +5174,13 @@ function updateDatabase() if ($datenbank_version < 102) { - $query = "ALTER TABLE #__sportsmanager_rangliste ADD lizenzen TEXT DEFAULT NULL AFTER geschlecht"; + $query = "ALTER TABLE #__sportsmanager_rangliste ADD lizenzen varchar(30) DEFAULT NULL AFTER streichergebnisse"; $db->setQuery($query); if (!$result = $db->execute()) { die($db->stderr(true)); } - $query = "ALTER TABLE #__sportsmanager_spieler ADD lizenz TEXT DEFAULT NULL AFTER nachname"; + $query = "ALTER TABLE #__sportsmanager_spieler ADD lizenz varchar(30) DEFAULT NULL AFTER lizenznr"; $db->setQuery($query); if (!$result = $db->execute()) { die($db->stderr(true));