From 412bcc1035545ec542f1b38ce1ad6eea6e998083 Mon Sep 17 00:00:00 2001
From: asandikci <git@aliberksandikci.com.tr>
Date: Mon, 8 Jan 2024 19:05:46 +0300
Subject: [PATCH] test data before use

---
 index.php      | 18 +++++++++++++++++-
 src/server.php | 21 +++++++++++++++++++--
 2 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/index.php b/index.php
index bacff84..de6ddf6 100644
--- a/index.php
+++ b/index.php
@@ -106,12 +106,28 @@
 <script>
   function updateData() {
     xmlHttp = new XMLHttpRequest();
+    xmlHttp.onreadystatechange = function() {
+        if (this.readyState == 4 && this.status == 200) {
+            var response = xmlHttp.responseText 
+            if (response.includes("parseError") ){
+              console.error("VERİLER YANLIŞ ŞEKİLDE GİRİLMİŞ, GÖTÜNÜ SİKEYİM KELO");          
+              console.warn(response);
+            } else if (response.includes("fileError")){
+              console.error("VERİ DOSYASI SUNUCUDA BULUNAMADI, SUNUCUYU KONTROL EDİNİZ");
+              console.warn(response);
+            } else if (response.includes("success")) {
+              console.info("VERİLER BAŞARIYLA GÜNCELLENDİ")
+            } else {
+              console.warn("VERİ GÜNCELLENİRKEN BİR HATA OLUŞTU, SAYFAYI YENİLEMEYİ DENEYİN");
+            }
+        }
+    };
     params = "updateData=yes";
     xmlHttp.open("POST", "src/server.php", true);
     xmlHttp.setRequestHeader('Content-type', 'application/x-www-form-urlencoded');
     xmlHttp.send(params);
     flag = true;
-    return "UPDATED DATA FROM SERVER!"
+    return;
   }
 </script>
 <script>
diff --git a/src/server.php b/src/server.php
index cc6825e..3c446f1 100644
--- a/src/server.php
+++ b/src/server.php
@@ -10,13 +10,29 @@ $parser = new Toml();
 $dock_local_test = 1;
 
 # Fetch Remote data and update data.toml (running each 10 min with cronjob)
+function testData($toml)
+{
+  global $parser;
+  try {
+    $array = $parser::Parse($toml);
+  } catch (Exception $e) {
+    $ans = 'Caught exception: ' .  $e->getMessage() . "\n"; 
+    return $ans;
+  }
+  return 0;
+}
+
 function updateRemoteData()
 {
   global $DATAACCESS_TOKEN;
   global $APP_NAME;
   $string = file_get_contents("https://git.aliberksandikci.com.tr/api/v1/repos/ifl/YurdleBackend/raw/data.toml?access_token=" . $DATAACCESS_TOKEN);
   if ($string === FALSE) {
-    echo "Could not read the file.";
+    echo "fileError: Could not read the file or could not get the file from server";
+    return;
+  } else if (testData($string) != 0) {
+    echo "parseError: " . testData($string);
+    return;
   } else {
     $file = __DIR__ . "/../data.toml";
     file_put_contents($file, $string, LOCK_EX);
@@ -25,6 +41,7 @@ function updateRemoteData()
   chown("$file", $APP_NAME);
 
   parseTOML(); // not necessary
+  echo "success";
 }
 
 
@@ -193,4 +210,4 @@ function parseTOML()
 
 if ($_POST['updateData'] != null && $_POST['updateData'] == "yes") {
   updateRemoteData();
-}
\ No newline at end of file
+}