Chart.js 4.4.7, Javascript in head und array_is_list für ältere php v…

…ersionen Chart.js aktualisiert auf Version 4.4.7 Skripte in der index.php nach vorne in den head zum schnelleren laden. array_is_list für ältere php-Versionen in interface.php integriert
homematic-community · Jan 19, 2025 · 77f3877 · 77f3877
1 parent 7f59cd5
commit 77f3877
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 27 deletions.
diff --git a/index.php b/index.php
@@ -352,7 +352,25 @@ function read_config($file) {
         <link rel="apple-touch-icon" sizes="152x152" href="apple-touch-icon-152x152.png" />
         <link rel="apple-touch-icon" sizes="180x180" href="apple-touch-icon-180x180.png" />
 
+	    <script type="text/javascript">
+            //<![CDATA[
+            var homematicIp = '<?php echo $homematicIp; ?>';
+			<?php if(file_exists("dev/export.json")) { echo "var dev = 1;\n"; } else { echo "var dev = 0;\n"; }?>
+            var logo = '<?php echo $logo; ?>';
+            var latitude = '<?php echo $latitude; ?>';
+            var longitude = '<?php echo $longitude; ?>';       
+            var timerMiliseconds = <?php echo $timerPeriod * 1000; ?>;
+            //]]>
+        </script>
+
+		<script src="js/jquery-3.7.1.min.js"></script>
+		<script src="js/chart.js"></script>
+		<script src="js/bootstrap.min.js.php?transition_duration=<?php echo $transition_duration; ?>"></script>
+		<script src='js/sun.js'></script> 		
+        <script src='js/script.js.php?<?php echo "id=".rand(1,100); ?>'></script>
 
+		<?php if(file_exists("custom/js/custom.js")) { echo "<script src='custom/js/custom.js?id=".rand(1,100)."'></script>"; } ?>
+        <?php if(isset($ioBrokerComponent)) { echo "<script src='js/ioBroker.js?id=".rand(1,100)."'></script>"; } ?>
 
     </head>
     <body name="top">
@@ -625,25 +643,7 @@ function read_config($file) {
 
 		</div>
 
-	    <script type="text/javascript">
-            //<![CDATA[
-            var homematicIp = '<?php echo $homematicIp; ?>';
-			<?php if(file_exists("dev/export.json")) { echo "var dev = 1;\n"; } else { echo "var dev = 0;\n"; }?>
-            var logo = '<?php echo $logo; ?>';
-            var latitude = '<?php echo $latitude; ?>';
-            var longitude = '<?php echo $longitude; ?>';       
-            var timerMiliseconds = <?php echo $timerPeriod * 1000; ?>;
-            //]]>
-        </script>
-
-		<script src="js/jquery-3.7.1.min.js"></script>
-		<script src="js/chart.js"></script>
-		<script src="js/bootstrap.min.js.php?transition_duration=<?php echo $transition_duration; ?>"></script>
-		<script src='js/sun.js'></script> 		
-        <script src='js/script.js.php?<?php echo "id=".rand(1,100); ?>'></script>
-
-		<?php if(file_exists("custom/js/custom.js")) { echo "<script src='custom/js/custom.js?id=".rand(1,100)."'></script>"; } ?>
-        <?php if(isset($ioBrokerComponent)) { echo "<script src='js/ioBroker.js?id=".rand(1,100)."'></script>"; } ?>
+
 
 	</body>
 </html>
diff --git a/interface.php b/interface.php
@@ -71,6 +71,17 @@ function ccu_remote($ccu, $ccu_request, $plain_result = false) {
   return $content;
 }
 
+if (!function_exists("array_is_list")) {
+  function array_is_list(array $array): bool {
+    $i = -1;
+      foreach ($array as $k => $v) {
+        ++$i;
+        if ($k !== $i) return false;
+      }
+    return true;
+  }
+}
+
 // ALLE STATES
 if (isset($_SERVER['QUERY_STRING']) and (strpos($_SERVER['QUERY_STRING'], "statelist.cgi") !== false)) {
   header("Content-Type: text/xml; charset=ISO-8859-1");

diff --git a/js/chart.js b/js/chart.js