Finalisation

Ajout id player et id_alliance insertion universe installation si version sup a 3.3.7 suppriesion d'une fonction inutile (create univers vide)
OGSteam · Mar 14, 2020 · 3b6ea3d · 3b6ea3d
1 parent a1525fc
commit 3b6ea3d
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 9 deletions.
diff --git a/cron.php b/cron.php
@@ -11,7 +11,7 @@
 define('IN_SUPERAPIX', true);
 define('IN_XTENSE', true);
 
-date_default_timezone_set(@date_default_timezone_get());
+date_default_timezone_set(date_default_timezone_get());
 
 if (preg_match('#mod#', getcwd()))
     chdir('../../');

diff --git a/include/function.php b/include/function.php
@@ -277,7 +277,7 @@ function traitement_universe($value) {
 
     $query = array();
 
-    $fields = "g, s, r, id_player , datadate , name_planete ,name_moon , moon  , sender_id   ";
+    $fields = "g, s, r, id_player  , datadate , name_planete ,name_moon , moon  , sender_id   ";
 
     foreach ($value->planet as $ta_planete_en_cours) {
         $t_coordonnee = explode(':', $ta_planete_en_cours[0]['coords']); // récuperation coord en cours
@@ -313,7 +313,7 @@ function traitement_universe($value) {
     $sql .= " ON ";
     $sql .= "( A.id_alliance = P.id_ally  )   ";
     $sql .= " SET ";
-    $sql .= " U.moon = T.moon , U.name = T.name_planete  , U.ally = A.tag , U.player = P.name_player , U.status = P.status   , U.last_update = T.datadate   , U.last_update_user_id = T.sender_id  ";
+    $sql .= "  U.player_id   = T.id_player  ,  U.ally_id   = P.id_ally   , U.moon = T.moon , U.name = T.name_planete  , U.ally = A.tag , U.player = P.name_player , U.status = P.status   , U.last_update = T.datadate   , U.last_update_user_id = T.sender_id  ";
     $sql .= " WHERE  ";
     $sql .= "  U.last_update <= T.datadate "; // <= pour permettre d ecraser la derniere importation si plantage de la derniere
 
@@ -655,7 +655,7 @@ function findSpaId() {
 // le chemin distant renvoit il a un xml ?????
 function DistantIsFileIXml($url) {
     if ($stream = fopen($url, 'r')) {
-        // 5 premier octet => verif bidons todo voir charge avec get_headers ...
+        // 5 premier octet => verif bidons
         $sStream = stream_get_contents($stream, 5);
         if ($sStream == "<?xml") {
             loggeur("check fichier XML ok " . $url);

diff --git a/index.php b/index.php
@@ -21,7 +21,7 @@
 }
 
 if (isset($pub_create_uni)) {
-
+    //plus necessaire
     create_uni_vide();
 }
 

diff --git a/model/config.php b/model/config.php
@@ -29,7 +29,15 @@ function find_config($name) {
     return NULL;
 }
 
+function  check_uni_vide()
+{
+
+}
+
+/// devenu obsolete : rempli_table_univers() a l'install et update garantisse les datas
 function create_uni_vide() {
+    return null;
+    // ce qui suit ne sera pas executé
     global $db, $server_config;
 
     $query = array();

diff --git a/model/install.php b/model/install.php
@@ -148,7 +148,7 @@ function rempli_table_univers() {
     $query = array();
 
 
-    $fields = "g, s, r, id_player , datadate , name_planete ,name_moon , moon  , sender_id   ";
+    $fields = "g, s, r, id_player ,  datadate , name_planete ,name_moon , moon  , sender_id   ";
 
 
 

diff --git a/model/model_CST_UNIVERSE.php b/model/model_CST_UNIVERSE.php
@@ -52,7 +52,7 @@
 
  // avant de traiter le $_post, on va preparer uni vide avec le timestamp si besoin
 
- // todo faire une requete update apour remise a 0 avec comme where la galaxie et le timstamp ( si inf => 0 )
+ //  faire une requete update apour remise a 0 avec comme where la galaxie et le timstamp ( si inf => 0 )
 //$uni = (int)$galaxie;
 
   //  for ($i = 1; $i < ((int)$server_config['num_of_systems'] + 1 ); $i++) {

diff --git a/update.php b/update.php
@@ -41,6 +41,9 @@
 create_table_players();
 delete_table_alliances();
 create_table_alliances() ;
+delete_table_univers();
+create_table_univers();
+rempli_table_univers();
 
 
 

diff --git a/version.txt b/version.txt
@@ -1,5 +1,5 @@
 Superapix
-0.3.2
+0.3.3
 superapix,superapix,superapix,superapix,index.php,1,1
-3.3.2
+3.3.7
 
diff --git a/vue/index.php b/vue/index.php
@@ -227,12 +227,14 @@
             <hr />
 
             <legend>Autres</legend>
+            <!-- obsolete et plus necessaire
                <div class="form-grp tooltip">
                    <a class ="btn" href="index.php?action=superapix&create_uni">Uni vide</a>
                    <span> <div class="pop-title">Uni Vide</div>
                         rempli l'univers d'entrée vide,<br /> Pour ogspy tout neuf.<br /><br /> Ne lancer qu'une seule fois
                     </span>
                </div>
+               -->
                    <div class="form-grp tooltip">
             <a class ="btn" href="index.php?action=superapix&reinit">Réinitalisation</a>
             <span> <div class="pop-title">Réinitalisation</div>
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,7 +21,7 @@ @@
     }
     if (isset($pub_create_uni)) {
+        //plus necessaire
         create_uni_vide();
     }
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -148,7 +148,7 @@ function rempli_table_univers() {
		$query = array();


		$fields = "g, s, r, id_player , datadate , name_planete ,name_moon , moon , sender_id ";
		$fields = "g, s, r, id_player , datadate , name_planete ,name_moon , moon , sender_id ";



Expand Down