From d534437a9a21f702a232a447a9c11e8c817708bd Mon Sep 17 00:00:00 2001
From: machine62 <28401480+machine62@users.noreply.github.com>
Date: Fri, 1 Mar 2024 14:50:55 +0100
Subject: [PATCH] clean up

suppression/nettoyage
remise en service barre de progression
---
 js/cross_domain.js   |  2 --
 js/step.js           | 12 ++++++------
 vue/cross_domain.php | 10 ----------
 vue/index.php        | 43 ++++++++++++++++++++++++++++++++++++++++++-
 vue/step.php         | 42 ++++++++++++++++--------------------------
 5 files changed, 64 insertions(+), 45 deletions(-)

diff --git a/js/cross_domain.js b/js/cross_domain.js
index a8837ad..b6de36e 100644
--- a/js/cross_domain.js
+++ b/js/cross_domain.js
@@ -1,6 +1,4 @@
 $(document).ready(function () {
-  //alert($(location).attr('href'));
-
   next_step(step)
 
 });
diff --git a/js/step.js b/js/step.js
index 56a09dd..f64ae8d 100644
--- a/js/step.js
+++ b/js/step.js
@@ -31,21 +31,21 @@ function stepProgressBar(data) {
   if (currentstep <= step) { // si bug et reponse inconnu
     if (data == null || data["ok"] == null) {
       alert("Une erreur est survenue");
-      $('#content').text("Une erreur est survenue"); // information  utilisateur
-      $('#avancement').attr('value', step);// change l'attribut'
+      $('#spacontent').text("Une erreur est survenue"); // information  utilisateur
+      $('#spaavancement').attr('value', step);// change l'attribut'
 
     }
     else
       if (data["ok"] == "Aucune Action") {
         alert("aucune mise à jour disponible");
-        $('#content').text("aucune mise à jour disponible"); // information  utilisateur
-        $('#avancement').attr('value', step);// change l'attribut'
+        $('#spacontent').text("aucune mise à jour disponible"); // information  utilisateur
+        $('#spaavancement').attr('value', step);// change l'attribut'
 
       }
       else {
         currentstep = currentstep + 1;
-        $('#avancement').attr('value', currentstep);// change l'attribut'
-        $('#content').text("<< " + data["ok"] + "(" + data["temps"] + " s) >>"); // information  utilisateur
+        $('#spaavancement').attr('value', currentstep);// change l'attribut'
+        $('#spacontent').text("<< " + data["ok"] + "(" + data["temps"] + " s) >>"); // information  utilisateur
         startstep(currentstep); // next step
       }
   }
diff --git a/vue/cross_domain.php b/vue/cross_domain.php
index 3944751..dfb0442 100644
--- a/vue/cross_domain.php
+++ b/vue/cross_domain.php
@@ -93,13 +93,3 @@
     stream_copy($url, MOD_ROOT_XML . $pub_url . '.xml'); // xcopy buggant ...
 }
 
-  //var_dump($url);
-//https://beubeulblog.fr/anges/ogspy/index.php?action=superapix($pub_url);
-
-
- //  $url = uni_replace(find_config('uni'),$url);
-
-  // header("Content-type: text/xml");
-//  readfile($url);
-  //var_dump($url);
-//var_dump($pub_url);
diff --git a/vue/index.php b/vue/index.php
index 83ad138..c02eb73 100644
--- a/vue/index.php
+++ b/vue/index.php
@@ -15,25 +15,66 @@
 $tcallbacks = constante_xtense_callbacks();
 $uIdSuperapix = spaModId();
 
-//include_once MOD_ROOT_VUE . "css.php";
 
 ?>
+
+<style>
+    .progress {
+        width: 100%;
+        height: 30px;
+        color: #ddd;
+        padding: 3px 3px 3px 3px;
+        border-radius: 5px;
+    }
+
+    .progress[value] {
+        --color: Green;
+        --background: lightgrey;
+        appearance: none;
+        border: none;
+        width: 100%;
+        padding: 3px 3px 3px 3px;
+        border-radius: 5px;
+        background: var(--background);
+    }
+
+
+</style>
+
+
+
 <div class="og-msg ">
     <h3 class="og-title">Mod Superapix</h3>
     <p class="og-content">Superapix est un mod Ogspy permettant de mettre à jour depuis l'api XML d'ogame</p>
     <p class="og-content">Celui ci est maintenant profilé pour automatiquement se mettre à jour sans actions utilisateurs </p>
 </div>
+
+
+
+<div class="og-msg">
+    <progress id="spaavancement" class="progress" value="0" max="39">
+
+    </progress>
+    <p id="spacontent" class="og-highlight"></p>
+
+
+</div>
+
+
+
 <?php if ($tcheckSecurity != NULL) : ?>
     <div class="og-msg og-msg-danger ">
         <h3 class="og-title">Mod Superapix</h3>
         <p class="og-content"> La configuration du mod semble incorrecte (<?php echo count($tcheckSecurity); ?> erreur(s)).</p>
     </div>
 <?php else : ?>
+    <!--
     <div class="og-msg og-msg-success">
         <p class="og-content">La configuration du mod semble correcte <br> </p>
         <br>
 
     </div>
+-->
     <table class="og-table ">
         <tbody>
             <tr>
diff --git a/vue/step.php b/vue/step.php
index 4501cb4..a99cdc1 100644
--- a/vue/step.php
+++ b/vue/step.php
@@ -20,31 +20,21 @@
 
 // on charge le xml
 $value = f_chargement_fichier_xml(MOD_ROOT_XML . $type . ".xml");
-//var_dump($value);
 
-echo " test"; 
-if ($type == "CST_PLAYERS") {
-    traitement_player($value);
-}
-
-
-if ($type == "CST_ALLIANCES") {
-    traitement_alliance($value);
-}
-
-
-if ($type == "CST_UNIVERSE") {
-    traitement_universe($value);
-}
-
-
-
-if (strstr($type, "CST_ALLIANCES_RANK_")) {
-    traitement_alliance_rank($value, $type);
-}
-
-
-
-if (strstr($type, "CST_PLAYERS_RANK_")) {
-    traitement_player_rank($value, $type);
+switch ($type) {
+    case "CST_PLAYERS":
+        traitement_player($value);
+        break;
+    case "CST_ALLIANCES":
+        traitement_alliance($value);
+        break;
+    case "CST_UNIVERSE":
+        traitement_universe($value);
+        break;
+    default:
+        if (strstr($type, "CST_ALLIANCES_RANK_")) {
+            traitement_alliance_rank($value, $type);
+        } elseif (strstr($type, "CST_PLAYERS_RANK_")) {
+            traitement_player_rank($value, $type);
+        }
 }