From 396566e0fe3f1ac9c6f9cc5c37cf0217949d2248 Mon Sep 17 00:00:00 2001
From: Bartek Fabiszewski <github@fabiszewski.net>
Date: Tue, 19 Sep 2017 08:22:28 +0200
Subject: [PATCH] Always return empty array

---
 utils/getpositions.php | 73 +++++++++++++++++++++---------------------
 utils/gettracks.php    | 43 ++++++++++++-------------
 2 files changed, 57 insertions(+), 59 deletions(-)

diff --git a/utils/getpositions.php b/utils/getpositions.php
index 940b13e..2df35ba 100755
--- a/utils/getpositions.php
+++ b/utils/getpositions.php
@@ -26,9 +26,8 @@ $auth = new uAuth();
 $userId = (isset($_REQUEST["userid"]) && is_numeric($_REQUEST["userid"])) ? (int) $_REQUEST["userid"] : NULL;
 $trackId = (isset($_REQUEST["trackid"]) && is_numeric($_REQUEST["trackid"])) ? (int) $_REQUEST["trackid"] : NULL;
 
+$positionsArr = [];
 if ($userId) {
-  $positionsArr = [];
-
   if (uConfig::$public_tracks ||
       ($auth->isAuthenticated() && ($auth->isAdmin() || $auth->user->id === $userId))) {
     if ($trackId) {
@@ -42,40 +41,40 @@ if ($userId) {
       }
     }
   }
-
-  header("Content-type: text/xml");
-  $xml = new XMLWriter();
-  $xml->openURI("php://output");
-  $xml->startDocument("1.0");
-  $xml->setIndent(true);
-  $xml->startElement('root');
-
-  foreach ($positionsArr as $position) {
-    $xml->startElement("position");
-    $xml->writeAttribute("id", $position->id);
-      $xml->writeElement("latitude", $position->latitude);
-      $xml->writeElement("longitude", $position->longitude);
-      $xml->writeElement("altitude", ($position->altitude) ? round($position->altitude) : $position->altitude);
-      $xml->writeElement("speed", $position->speed);
-      $xml->writeElement("bearing", $position->bearing);
-      $xml->writeElement("timestamp", $position->timestamp);
-      $xml->writeElement("accuracy", $position->accuracy);
-      $xml->writeElement("provider", $position->provider);
-      $xml->writeElement("comments", $position->comment);
-      $xml->writeElement("username", $position->userLogin);
-      $xml->writeElement("trackid", $position->trackId);
-      $xml->writeElement("trackname", $position->trackName);
-      $distance = isset($prevPosition) ? $position->distanceTo($prevPosition) : 0;
-      $xml->writeElement("distance", round($distance));
-      $seconds = isset($prevPosition) ? $position->secondsTo($prevPosition) : 0;
-      $xml->writeElement("seconds", $seconds);
-    $xml->endElement();
-    $prevPosition = $position;
-  }
-
-  $xml->endElement();
-  $xml->endDocument();
-  $xml->flush();
 }
 
-?>
+header("Content-type: text/xml");
+$xml = new XMLWriter();
+$xml->openURI("php://output");
+$xml->startDocument("1.0");
+$xml->setIndent(true);
+$xml->startElement('root');
+
+foreach ($positionsArr as $position) {
+  $xml->startElement("position");
+  $xml->writeAttribute("id", $position->id);
+    $xml->writeElement("latitude", $position->latitude);
+    $xml->writeElement("longitude", $position->longitude);
+    $xml->writeElement("altitude", ($position->altitude) ? round($position->altitude) : $position->altitude);
+    $xml->writeElement("speed", $position->speed);
+    $xml->writeElement("bearing", $position->bearing);
+    $xml->writeElement("timestamp", $position->timestamp);
+    $xml->writeElement("accuracy", $position->accuracy);
+    $xml->writeElement("provider", $position->provider);
+    $xml->writeElement("comments", $position->comment);
+    $xml->writeElement("username", $position->userLogin);
+    $xml->writeElement("trackid", $position->trackId);
+    $xml->writeElement("trackname", $position->trackName);
+    $distance = isset($prevPosition) ? $position->distanceTo($prevPosition) : 0;
+    $xml->writeElement("distance", round($distance));
+    $seconds = isset($prevPosition) ? $position->secondsTo($prevPosition) : 0;
+    $xml->writeElement("seconds", $seconds);
+  $xml->endElement();
+  $prevPosition = $position;
+}
+
+$xml->endElement();
+$xml->endDocument();
+$xml->flush();
+
+?>
\ No newline at end of file
diff --git a/utils/gettracks.php b/utils/gettracks.php
index 161aff5..c13d62b 100755
--- a/utils/gettracks.php
+++ b/utils/gettracks.php
@@ -24,33 +24,32 @@ $auth = new uAuth();
 
 $userId = (isset($_REQUEST["userid"]) && is_numeric($_REQUEST["userid"])) ? (int) $_REQUEST["userid"] : NULL;
 
+$tracksArr = [];
 if ($userId) {
-  $tracksArr = [];
-
   if (uConfig::$public_tracks ||
       ($auth->isAuthenticated() && ($auth->isAdmin() || $auth->user->id === $userId))) {
     $tracksArr = uTrack::getAll($userId);
   }
-
-  header("Content-type: text/xml");
-  $xml = new XMLWriter();
-  $xml->openURI("php://output");
-  $xml->startDocument("1.0");
-  $xml->setIndent(true);
-  $xml->startElement('root');
-
-  if (!empty($tracksArr)) {
-    foreach ($tracksArr as $aTrack) {
-      $xml->startElement("track");
-        $xml->writeElement("trackid", $aTrack->id);
-        $xml->writeElement("trackname", $aTrack->name);
-      $xml->endElement();
-    }
-  }
-
-  $xml->endElement();
-  $xml->endDocument();
-  $xml->flush();
 }
 
+header("Content-type: text/xml");
+$xml = new XMLWriter();
+$xml->openURI("php://output");
+$xml->startDocument("1.0");
+$xml->setIndent(true);
+$xml->startElement('root');
+
+if (!empty($tracksArr)) {
+  foreach ($tracksArr as $aTrack) {
+    $xml->startElement("track");
+      $xml->writeElement("trackid", $aTrack->id);
+      $xml->writeElement("trackname", $aTrack->name);
+    $xml->endElement();
+  }
+}
+
+$xml->endElement();
+$xml->endDocument();
+$xml->flush();
+
 ?>