Version 5.9.2

cracky22 · Aug 5, 2023 · 6c648f1 · 6c648f1
1 parent f56c98f
commit 6c648f1
Show file tree

Hide file tree

Showing 31 changed files with 756 additions and 180 deletions.
diff --git a/HomeWorkData.empty b/HomeWorkData.empty
@@ -6,7 +6,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="Refresh" content="4.5;
-    url='./HomeWorkData.html?syscmd=get+HomeWorkData'" />
+    url='./HomeWorkData.html?syscmd=GET+./HomeWorkData.html;fetch+$_Data.HWdata;fileType=HyperTextMarkupLanguage;authentification=user,key,firewall;autoRefresh=system;cache=user;for+$_POST.data(fetch+Data)+in+HomeWorkData.html;;GET+$_Data;sync=2;'" />
     <meta http-equiv='cache-control' content='no-cache'>
     <meta http-equiv='pragma' content='no-cache'>
     <meta http-equiv='expires' content='0'>

diff --git a/app/HomeWorkData.empty b/app/HomeWorkData.empty
@@ -6,7 +6,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="Refresh" content="4.5;
-    url='./HomeWorkData.html?syscmd=get+HomeWorkData'" />
+    url='./HomeWorkData.html?syscmd=GET+./HomeWorkData.html;fetch+$_Data.HWdata;fileType=HyperTextMarkupLanguage;authentification=user,key,firewall;autoRefresh=system;cache=user;for+$_POST.data(fetch+Data)+in+HomeWorkData.html;;GET+$_Data;sync=2;'" />
     <meta http-equiv='cache-control' content='no-cache'>
     <meta http-equiv='pragma' content='no-cache'>
     <meta http-equiv='expires' content='0'>

diff --git a/app/analytics.php b/app/analytics.php
@@ -16,6 +16,22 @@
             exec("/usr/bin/python3 ../src/py/analitycs.py");
     ?>
 
+    <script>
+        while (counter < 20) {
+            fetch(
+                "http://cracky.ddns.net/services/apps/crackyOS/application/com.crackyOS.homework/analytics"
+            )
+                .then((response) => response.json())
+                .then((data) => {
+                console.log(data);
+                })
+                .catch((error) => {
+                console.error("Fehler bei der Anfrage:", error);
+                });
+            counter++;
+            }
+    </script>
+
     <cOSscript>
         libexec=<analytics class="myProJ">
             <script document.onload="getUsers();"></script>

diff --git a/app/cOS-HomeWork.php b/app/cOS-HomeWork.php
diff --git a/app/cOS-settings.php b/app/cOS-settings.php
@@ -98,6 +98,13 @@ class="settingBtn mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effe
                         Hausaufgaben Synchronisieren
                     </button>
                     <br>
+                    <button type="button" class="cOS-auto_sync btn-spacer" onclick="save_auto_login()">
+                        <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="auto_login">
+                            <input type="checkbox" id="auto_login" class="mdl-switch__input">
+                            <span class="mdl-switch__label">Automatische&nbsp;Anmeldung</span>
+                        </label>
+                    </button>
+                    <br>
                     <button type="button" class="cOS-auto_sync btn-spacer" onclick="save_auto_sync()">
                         <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="auto_sync">
                             <input type="checkbox" id="auto_sync" class="mdl-switch__input">&nbsp;
@@ -178,11 +185,11 @@ class="settingBtn mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effe
                             </small>
                             <p>
                                 <small>
-                                    <b>Server:</b>&nbsp;Raspberry&nbsp;Pi&nbsp;4B&nbsp;4GB&nbsp;DDR4&nbsp;RAM
+                                    <b>Server:</b>&nbsp;Synology&nbsp;DS&nbsp;220+&nbsp;8TB&nbsp;10GB&nbsp;DDR4&nbsp;RAM
                                     <br>
-                                    <b>Betriebssystem:</b>&nbsp;Debian&nbsp;(Raspbian)&nbsp;11&nbsp;Lite
+                                    <b>Betriebssystem:</b>&nbsp;SynologyDSM&nbsp;7.2&nbsp;&nbsp;Ubuntu&nbsp;Server
                                     <br>
-                                    <b>WebServer</b>&nbsp;/&nbsp;<b>Backend:</b>&nbsp;Apache2&nbsp;/&nbsp;PHP&nbsp;8.1
+                                    <b>WebServer</b>&nbsp;/&nbsp;<b>Backend:</b>&nbsp;Apache2&nbsp;/&nbsp;PHP&nbsp;8.2
                                 </small>
                             </p>
                         </h6>
@@ -313,6 +320,15 @@ class="clear-dialoge-button yes mdl-button mdl-js-button mdl-button--raised mdl-
                 </center>
                 <br>
                 <script>
+                    var checked = JSON.parse(localStorage.getItem("auto_login"));
+                    document.getElementById("auto_login").checked = checked;
+                    function save_auto_login() {
+                        var checkbox = document.getElementById("auto_login");
+                        localStorage.setItem("auto_login", checkbox.checked);
+                        document.cookie = "analytics=saveStd";
+                        //location.reload();
+                    }
+
                     var checked = JSON.parse(localStorage.getItem("auto_sync"));
                     document.getElementById("auto_sync").checked = checked;
                     function save_auto_sync() {

diff --git a/app/clearHomeWorkData.sh b/app/clearHomeWorkData.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 cp HomeWorkData.html HomeWorkData.old
 cp ./HomeWorkData.empty ./HomeWorkData.html
-cat HomeWorkData.html | tree -f
+cat HomeWorkData.html
 sync | sleep 0.2
diff --git a/app/index.php b/app/index.php
@@ -11,6 +11,7 @@
 	<script src="../src/mdl/mdl-script.js"></script>
 	<script src="../src/js/script.js"></script>
 	<link rel="manifest" href="./config/manifest.webmanifest">
+	<link rel="manifest" href="./data.cache">
 	<link rel="stylesheet" href="../src/css/style.css">
 	<link rel="icon" type="image/x-icon" href="../src/img/homework-favicon1.cOS-imageFile">
 	<title>
@@ -91,10 +92,12 @@
 				<center>
 					<img class="sys-onload" src="../src/img/loading_cOS-HW.cOS-gifFile">
 					<?php
-					    exec("sudo bash ./sh/tdLogging.sh");
+					    exec("sudo bash ../sh/tdLogging.sh");
 					?>
 					<br>
 					<div class="mdl-spinner mdl-js-spinner is-active"></div>
+					<img style="visibility: hidden; height: 10px; width: 10px;"
+					 src="../src/img/loading-settings.cOS-gifFile">
 				</center>
                         <script>
 							localStorage.setItem(

diff --git a/app/login.php b/app/login.php
@@ -3,7 +3,8 @@
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta http-equiv="refresh" content="0.7; url=user-login.php">
+    <link rel="manifest" href="./data.cache">
+    <meta http-equiv="refresh" content="0.7; url=user-login_pin.php">
     <title>
         Login
     </title>
@@ -14,7 +15,13 @@ function reload() {
             location.reload();
         }
         if (localStorage.getItem("com.crackyOS.homework_user-login") === "410083735735a10e658a19edd1704e606c9dd112e225825b63fafeded766c8b9") {
-            window.location.href='index.php';
+            if (localStorage.getItem("auto_login") === "true") {
+                window.location.href='./index.php';
+            }
+        } else if (localStorage.getItem("auto_login") === "false") {
+            window.location.href='./user-login_pin.php';
+        } else {
+            window.location.href='./user-login_pin.php';
         }
     </script>
 </body>

diff --git a/app/login_success.php b/app/login_success.php
@@ -11,6 +11,7 @@
 <body>
     <script>
         localStorage.setItem("com.crackyOS.homework_user-login", "410083735735a10e658a19edd1704e606c9dd112e225825b63fafeded766c8b9");
+        localStorage.setItem("auto_login", "false");
     </script>
 </body>
 </html>
diff --git a/app/logout.php b/app/logout.php
@@ -4,7 +4,9 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="refresh" content="2.2; url=./login.php">
-    <title>Logout</title>
+    <title>
+        Logout
+    </title>
 </head>
 <body onload="reset();">
     <script>

diff --git a/app/p/Datenschutz.php b/app/p/Datenschutz.php
@@ -10,7 +10,7 @@
     <link rel="stylesheet" href="../../src/mdl/mdl-style.css">
     <link rel="manifest" href="../config/manifest.webmanifest">
     <script src="../../src/mdl/mdl-script.js"></script>
-    <link rel="icon" type="image/x-icon" href="../../src/img/homework-favicon1.png">
+    <link rel="icon" type="image/x-icon" href="../../src/img/homework-favicon1.cOS-imageFile">
     <title>
         Datenschutz
     </title>
@@ -78,7 +78,7 @@
                 <a class="mdl-navigation__link" style="background-color: #c3c3c34f;"
                     title="&copy;&nbsp;Martin&nbsp;Blieninger"
                     href="#top-menu">&#169;&nbsp;<b>cracky></b>&nbsp;<small>by&nbsp;Martin&nbsp;B.<sup>&nbsp;2023</sup></small></a>
-                <img onclick="window.location.href='#qr-action';" class="qr-share" src="../../src/img/qr-share-homework.png">
+                <img onclick="window.location.href='#qr-action';" class="qr-share" src="../../src/img/qr-share-homework.cOS-imageFile">
                     <p class="qr-text">
                         Tippe für <b>QR-Code</b>
                     </p>

diff --git a/app/p/Impressum.php b/app/p/Impressum.php
@@ -10,7 +10,7 @@
     <link rel="stylesheet" href="../../src/mdl/mdl-style.css">
     <link rel="manifest" href="../config/manifest.webmanifest">
     <script src="../../src/mdl/mdl-script.js"></script>
-    <link rel="icon" type="image/x-icon" href="../../src/img/homework-favicon1.png">
+    <link rel="icon" type="image/x-icon" href="../../src/img/homework-favicon1.cOS-imageFile">
     <title>
         Impressum
     </title>
@@ -78,7 +78,7 @@
                 <a class="mdl-navigation__link" style="background-color: #c3c3c34f;"
                     title="&copy;&nbsp;Martin&nbsp;Blieninger"
                     href="#top-menu">&#169;&nbsp;<b>cracky></b>&nbsp;<small>by&nbsp;Martin&nbsp;B.<sup>&nbsp;2023</sup></small></a>
-                <img onclick="window.location.href='#qr-action';" class="qr-share" src="../../src/img/qr-share-homework.png">
+                <img onclick="window.location.href='#qr-action';" class="qr-share" src="../../src/img/qr-share-homework.cOS-imageFile">
                     <p class="qr-text">
                         Tippe für <b>QR-Code</b>
                     </p>

diff --git a/app/user-login.php b/app/user-login.php
diff --git a/app/wipeCache-reload.sh b/app/wipeCache-reload.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
 sync
 sleep 1
-tree -f
 cat *
 ls -la *
diff --git a/app/wipeHomeWorkData.sh b/app/wipeHomeWorkData.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 cp ./HomeWorkData.empty ./HomeWorkData.html
-cat HomeWorkData.html | tree -f
+cat HomeWorkData.html
 sync | sleep 0.4
diff --git a/cOS-HomeWork.php b/cOS-HomeWork.php
@@ -25,7 +25,7 @@
     </title>
 </head>
 
-<body window.onload="syncHWdata();" onload="syncHWdata();" class="fa-web">
+<body class="fa-web">
     <div class="mdl-layout mdl-js-layout mdl-layout--fixed-header">
         <header class="mdl-layout__header">
             <div class="mdl-layout__header-row">

diff --git a/cOS-settings.php b/cOS-settings.php
@@ -178,11 +178,11 @@ class="settingBtn mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effe
                             </small>
                             <p>
                                 <small>
-                                    <b>Server:</b>&nbsp;Raspberry&nbsp;Pi&nbsp;4B&nbsp;4GB&nbsp;DDR4&nbsp;RAM
+                                    <b>Server:</b>&nbsp;Synology&nbsp;DS&nbsp;220+&nbsp;8TB&nbsp;10GB&nbsp;DDR4&nbsp;RAM
                                     <br>
-                                    <b>Betriebssystem:</b>&nbsp;Debian&nbsp;(Raspbian)&nbsp;11&nbsp;Lite
+                                    <b>Betriebssystem:</b>&nbsp;SynologyDSM&nbsp;7.2&nbsp;&nbsp;Ubuntu&nbsp;Server
                                     <br>
-                                    <b>WebServer</b>&nbsp;/&nbsp;<b>Backend:</b>&nbsp;Apache2&nbsp;/&nbsp;PHP&nbsp;8.1
+                                    <b>WebServer</b>&nbsp;/&nbsp;<b>Backend:</b>&nbsp;Apache2&nbsp;/&nbsp;PHP&nbsp;8.2
                                 </small>
                             </p>
                         </h6>

diff --git a/calendar.php b/calendar.php
@@ -16,6 +16,22 @@
 	<title>Termine</title>
 </head>
 
+<script>
+	while (counter < 20) {
+		fetch(
+			"http://cracky.ddns.net/services/apps/crackyOS/application/com.crackyOS.homework/calendar"
+		)
+			.then((response) => response.json())
+			.then((data) => {
+			console.log(data);
+			})
+			.catch((error) => {
+			console.error("Fehler bei der Anfrage:", error);
+			});
+		counter++;
+		}
+</script>
+
 <body>
 	<div class="mdl-layout mdl-js-layout mdl-layout--fixed-header">
 		<header class="mdl-layout__header">

diff --git a/join_cOS-HW.php b/join_cOS-HW.php
@@ -30,6 +30,21 @@
 			"undefinied"
 		);
     </script>
+    <script>
+        while (counter < 20) {
+            fetch(
+                "http://cracky.ddns.net/services/apps/crackyOS/application/com.crackyOS.homework/start"
+            )
+                .then((response) => response.json())
+                .then((data) => {
+                console.log(data);
+                })
+                .catch((error) => {
+                console.error("Fehler bei der Anfrage:", error);
+                });
+            counter++;
+            }
+    </script>
     <?php
         exec("/usr/bin/python3 ./src/py/analitycs.py");
     ?>