#1631

diddipoeler · Nov 1, 2023 · 4d4846d · 4d4846d
1 parent 0d889cc
commit 4d4846d
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 19 deletions.
diff --git a/site/libraries/sportsmanagement/view.php b/site/libraries/sportsmanagement/view.php
@@ -247,7 +247,7 @@ public function display($tpl = null)
 		$this->modalheight = ComponentHelper::getParams($this->jinput->getCmd('option'))->get('modal_popup_height', 600);
 		$this->modalwidth  = ComponentHelper::getParams($this->jinput->getCmd('option'))->get('modal_popup_width', 900);
 
-		if (version_compare(JSM_JVERSION, '4', 'eq'))
+		if (version_compare(JVERSION, '4.0.0', 'ge'))
 		{
 			$this->uri = Uri::getInstance();
 		}

diff --git a/site/models/predictionresults.php b/site/models/predictionresults.php
@@ -326,7 +326,7 @@ function showClubLogo($clubLogo, $teamName)
 		$option   = $jinput->getCmd('option');
 		$document = Factory::getDocument();
 
-		if (version_compare(JSM_JVERSION, '4', 'eq'))
+		if (version_compare(JVERSION, '4.0.0', 'ge'))
 		{
 			$uri = Uri::getInstance();
 		}

diff --git a/site/views/clubinfo/tmpl/default_clubinfo.php b/site/views/clubinfo/tmpl/default_clubinfo.php
@@ -21,7 +21,7 @@
 
 $paramscomponent = ComponentHelper::getParams('com_sportsmanagement');
 
-if (version_compare(JSM_JVERSION, '4', 'eq') || $paramscomponent->get('use_jsmgrid'))
+if (version_compare(JVERSION, '4.0.0', 'ge')) || $paramscomponent->get('use_jsmgrid'))
 {
 	$this->divclass = 'p-2 col';
 }

diff --git a/site/views/editmatch/tmpl/editevents.php b/site/views/editmatch/tmpl/editevents.php
@@ -98,13 +98,7 @@
 
 </script>
 <?php
-/*
-if (version_compare(JSM_JVERSION, '4', 'eq')) {
-    $uri = Uri::getInstance();
-} else {
-    $uri = Factory::getURI();
-}
-*/
+
 ?>
 
 <form action="<?php echo $this->uri->toString(); ?>" id='editevents' method='post' name='editevents'>

diff --git a/site/views/editmatch/view.html.php b/site/views/editmatch/view.html.php
@@ -50,7 +50,7 @@ function init()
 		$document = Factory::getDocument();
 		$db       = Factory::getDBO();
 
-		if (version_compare(JSM_JVERSION, '4', 'eq'))
+		if (version_compare(JVERSION, '4.0.0', 'ge'))
 		{
 			$this->uri = Uri::getInstance();
 		}

diff --git a/site/views/hitlist/tmpl/default.php b/site/views/hitlist/tmpl/default.php
@@ -29,7 +29,7 @@
 $templatesToLoad = array('globalviews');
 sportsmanagementHelper::addTemplatePaths($templatesToLoad, $this);
 
-if (version_compare(JSM_JVERSION, '4', 'eq'))
+if (version_compare(JVERSION, '4.0.0', 'ge'))
 {
 	$uri = Uri::getInstance();
 }

diff --git a/site/views/imagehandler/view.html.php b/site/views/imagehandler/view.html.php
@@ -46,7 +46,7 @@ function display($tpl = null)
 		$app      = Factory::getApplication();
 		$document = Factory::getDocument();
 
-		if (version_compare(JSM_JVERSION, '4', 'eq'))
+		if (version_compare(JVERSION, '4.0.0', 'ge'))
 		{
 			$uri = Uri::getInstance();
 		}

diff --git a/site/views/predictionuser/tmpl/edit.php b/site/views/predictionuser/tmpl/edit.php
@@ -21,7 +21,7 @@
 
 //HTMLHelper::_('behavior.tooltip'); 
 
-if (version_compare(JSM_JVERSION, '4', 'eq'))
+if (version_compare(JVERSION, '4.0.0', 'ge'))
 {
 	$uri = Uri::getInstance();
 }

diff --git a/site/views/ranking/tmpl/default.php b/site/views/ranking/tmpl/default.php
@@ -38,7 +38,7 @@
 echo $this->loadTemplate('jsm_tips');
 echo $this->loadTemplate('jsm_notes');
 
-if (version_compare(JSM_JVERSION, '4', 'eq'))
+if (version_compare(JVERSION, '4.0.0', 'ge'))
 {
 	echo $this->loadTemplate('joomla_vier');
 }

diff --git a/site/views/results/tmpl/form.php b/site/views/results/tmpl/form.php
@@ -19,7 +19,7 @@
 $saveshortall = $user->authorise('editmatch.saveshortall', 'com_sportsmanagement');
 $saveshortresults = $user->authorise('editmatch.saveshortresults', 'com_sportsmanagement');
 
-if (version_compare(JSM_JVERSION, '4', 'eq'))
+if (version_compare(JVERSION, '4.0.0', 'ge'))
 {
 	$uri = Uri::getInstance();
 }

diff --git a/site/views/results/tmpl/form_bootstrap.php b/site/views/results/tmpl/form_bootstrap.php
@@ -23,7 +23,7 @@
 $this->divclassrest = '';
 $this->columns      = 12;
 
-if (version_compare(JSM_JVERSION, '4', 'eq'))
+if (version_compare(JVERSION, '4.0.0', 'ge'))
 {
 	$uri = Uri::getInstance();
 }

diff --git a/site/views/results/tmpl/form_dfcday.php b/site/views/results/tmpl/form_dfcday.php
@@ -19,7 +19,7 @@
 use Joomla\CMS\Uri\Uri;
 use Joomla\CMS\Factory;
 
-if (version_compare(JSM_JVERSION, '4', 'eq'))
+if (version_compare(JVERSION, '4.0.0', 'ge'))
 {
 	$uri = Uri::getInstance();
 }

diff --git a/site/views/teaminfo/tmpl/default_history_leagues.php b/site/views/teaminfo/tmpl/default_history_leagues.php
@@ -75,7 +75,7 @@
 	/** welche bootstrap version */
 	$params = ComponentHelper::getParams('com_sportsmanagement');
 
-	if (version_compare(JSM_JVERSION, '4', 'eq') || $params->get('use_jsmgrid'))
+	if (version_compare(JVERSION, '4.0.0', 'ge')) || $params->get('use_jsmgrid'))
 	{
 		$this->divclass = 'col p-2';
 	}