mirror of
https://github.com/Deutscher-Tischfussballbund/com_sportsmanager.git
synced 2026-06-10 06:27:52 +00:00
Merge pull request #119 from Deutscher-Tischfussballbund/sportsmanager2-dev
Dev -> Stage merge
This commit is contained in:
@@ -83,7 +83,3 @@ JConfig: `./data/joomla_data/configuration.php`
|
|||||||
7. Click on "Start Listening for PHP Debug Connections" in the top row of intellij
|
7. Click on "Start Listening for PHP Debug Connections" in the top row of intellij
|
||||||
8. (Not sure if optional) Install a browser extension by Jetbrains
|
8. (Not sure if optional) Install a browser extension by Jetbrains
|
||||||
https://chromewebstore.google.com/detail/xdebug-helper-by-jetbrain/aoelhdemabeimdhedkidlnbkfhnhgnhm
|
https://chromewebstore.google.com/detail/xdebug-helper-by-jetbrain/aoelhdemabeimdhedkidlnbkfhnhgnhm
|
||||||
|
|
||||||
=======
|
|
||||||
|
|
||||||
Test
|
|
||||||
|
|||||||
@@ -0,0 +1,2 @@
|
|||||||
|
This is no official release!
|
||||||
|
The Release and the release notes will be generated by github actions
|
||||||
|
|||||||
@@ -2323,6 +2323,10 @@ function mp_mult_($p1, $p2): float|int
|
|||||||
*/
|
*/
|
||||||
function mp_div_($p1, $p2): float|int
|
function mp_div_($p1, $p2): float|int
|
||||||
{
|
{
|
||||||
|
if ($p2 == 0) {
|
||||||
|
Log::add("Division by zero detected in mp_div_: divisor was 0. Returning 0 as fallback.", Log::WARNING, "com_sportsmanager");
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
return $p1 / $p2;
|
return $p1 / $p2;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -71,7 +71,7 @@ if ($task == "spielerbild") {
|
|||||||
terminDokument();
|
terminDokument();
|
||||||
} else if ($task == "spieler_details") {
|
} else if ($task == "spieler_details") {
|
||||||
spielerDetails();
|
spielerDetails();
|
||||||
} else if (str_starts_with($task, "admin_")) {
|
} else if ($task !== null && str_starts_with($task, "admin_")) {
|
||||||
// in some cases there are no breaks needed due to no return from method
|
// in some cases there are no breaks needed due to no return from method
|
||||||
switch ($task) {
|
switch ($task) {
|
||||||
case 'admin_einstellungen':
|
case 'admin_einstellungen':
|
||||||
@@ -1577,8 +1577,12 @@ function veranstaltung(): void
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$showSeasons = false;
|
||||||
|
if (count($saisons) > 1) {
|
||||||
|
$showSeasons = true;
|
||||||
|
}
|
||||||
// Anzeigen
|
// Anzeigen
|
||||||
HTML_sportsmanager::veranstaltungHeaderAlone($veranstaltung, $vorherige_veranstaltung_id, $naechste_veranstaltung_id);
|
HTML_sportsmanager::veranstaltungHeaderAlone($veranstaltung, $vorherige_veranstaltung_id, $naechste_veranstaltung_id, $showSeasons, $saisons, $filter_saison_id);
|
||||||
|
|
||||||
if ($veranstaltung->tabellenwertung != 0)
|
if ($veranstaltung->tabellenwertung != 0)
|
||||||
tabelle($veranstaltung, $spieltag, true);
|
tabelle($veranstaltung, $spieltag, true);
|
||||||
|
|||||||
@@ -382,7 +382,7 @@ function yoothemeBild($typ, $id, $alternativ, $resize = '', $zusatz = ""): ?stri
|
|||||||
else
|
else
|
||||||
return null;
|
return null;
|
||||||
|
|
||||||
$bildpfad = "/images/sportsmanager/" . $typ . "/" . $typ_prefix . $id . "." . $ext;
|
$bildpfad = SPORTSMANAGER_JOOMLA_URL . "images/sportsmanager/" . $typ . "/" . $typ_prefix . $id . "." . $ext;
|
||||||
|
|
||||||
return '<img class="el-image" data-src="' . $bildpfad . $resize . '" ' . $zusatz . ' uk-img />';
|
return '<img class="el-image" data-src="' . $bildpfad . $resize . '" ' . $zusatz . ' uk-img />';
|
||||||
}
|
}
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -291,8 +291,6 @@ class HTML_sportsmanager_ticker
|
|||||||
type="text/css"/>
|
type="text/css"/>
|
||||||
<script src="<?php echo Route::_(Uri::root(TRUE) . '/components/com_sportsmanager/js/jquery.min.js'); ?>"
|
<script src="<?php echo Route::_(Uri::root(TRUE) . '/components/com_sportsmanager/js/jquery.min.js'); ?>"
|
||||||
type="text/javascript"></script>
|
type="text/javascript"></script>
|
||||||
<script type="text/javascript"
|
|
||||||
src="<?php echo Route::_(Uri::root(TRUE) . '/components/com_sportsmanager/js/css3.js'); ?>"></script>
|
|
||||||
<script>
|
<script>
|
||||||
let globalresize = 0;
|
let globalresize = 0;
|
||||||
|
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ function addOnLoad($function): void
|
|||||||
<?php
|
<?php
|
||||||
}
|
}
|
||||||
|
|
||||||
function SportsManagerURL($weitereParameter = null, $ssl = 0): ?string
|
function SportsManagerURL($weitereParameter = "", $ssl = 0): ?string
|
||||||
{
|
{
|
||||||
$urlPath = handleFilter($weitereParameter);
|
$urlPath = handleFilter($weitereParameter);
|
||||||
$joomlaBaseUrl = Uri::getInstance()->toString([
|
$joomlaBaseUrl = Uri::getInstance()->toString([
|
||||||
|
|||||||
Reference in New Issue
Block a user