Merge pull request #56 from Deutscher-Tischfussballbund/license_fixes

fix: minor fixes regarding licenses including database fields for license

src/structure/components/com_sportsmanager/database.php

@@ -5172,6 +5172,29 @@ function updateDatabase()
         }
     }
 
+
+    if ($datenbank_version < 102) {
+        $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 varchar(30) DEFAULT NULL AFTER lizenznr";
+        $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";

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]);
+    $numeric = substr($val, 0, strlen($val) -1);
-		switch ($last) {
+	$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;
+		  $numeric *= 1024;
-	}
-	return $val;
 	}
+	return $numeric;
 }
 
 function encrypt($str, $key){

src/structure/components/com_sportsmanager/views/sportsmanager/view_admin.php

@@ -5327,7 +5327,7 @@ class HTML_sportsmanager_admin
                                     $lizenzen = ['A', 'B', 'C', 'D'];
                                     foreach ($lizenzen as $lizenz)
                                     {
-                                        $checked = ($rangliste != null && is_array($lizenz) && in_array($lizenz, $rangliste->lizenzen)) ? ' checked': '';
+                                        $checked = ($rangliste != null && is_array($rangliste->lizenzen) && in_array($lizenz, $rangliste->lizenzen)) ? ' checked': '';
                                         echo '<label><input class="uk-checkbox" name="lizenzen[]" id="lizenzen[]" value="' . $lizenz. '" type="checkbox"' . $checked. '> ' . $lizenz. '</label><br>';
                                     }
                                     ?>

src/structure/script.php

@@ -400,6 +400,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,"
@@ -585,6 +586,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,"
@@ -1087,7 +1089,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)); }