From 0dc2ce90ec3334b9af82736b85233db94debc0cf Mon Sep 17 00:00:00 2001
From: Krivchikov Dmitry <KrivchikovDA@gmail.com>
Date: Fri, 27 May 2016 20:19:38 +0300
Subject: [PATCH] =?UTF-8?q?ADD=20=D0=BD=D0=B0=D1=87=D0=B0=D0=BB=D0=BE=20?=
 =?UTF-8?q?=D0=B8=D0=BC=D0=BF=D0=BE=D1=80=D1=82=D0=B0=20=D1=81=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B7=D1=83=20=D0=BF=D0=BE=D1=81=D0=BB=D0=B5=20=D0=B0=D0=BF?=
 =?UTF-8?q?=D0=BB=D0=BE=D0=B0=D0=B4=D0=B0=20=D1=84=D0=B0=D0=B9=D0=BB=D0=B0?=
 =?UTF-8?q?;=20=D0=B2=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE=D1=81?=
 =?UTF-8?q?=D1=82=D1=8C=20=D1=81=D0=BA=D0=B0=D1=87=D0=B0=D1=82=D1=8C=20?=
 =?UTF-8?q?=D0=B8=D1=81=D1=85=D0=BE=D0=B4=D0=BD=D1=8B=D0=B9=20=D1=84=D0=B0?=
 =?UTF-8?q?=D0=B9=D0=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 controllers/TracksController.php | 25 ++++++++++++++++++++++++-
 views/file.php                   | 20 ++++++++++++++++++++
 views/tracks/files.php           | 10 +---------
 views/tracks/index.php           | 20 ++++++++++++++++++--
 4 files changed, 63 insertions(+), 12 deletions(-)
 create mode 100644 views/file.php

diff --git a/controllers/TracksController.php b/controllers/TracksController.php
index a464e10..a1939d0 100644
--- a/controllers/TracksController.php
+++ b/controllers/TracksController.php
@@ -60,7 +60,30 @@ class TracksController extends Controller
 			App::error404();
 		}
 
-		App::redirect('/tracks/files');
+		App::redirect('/tracks/importgpx/id/'.$tmp->id);
+	}
+
+	function actionGetFile()
+	{
+		$id = intval(App::getParam('id'));
+
+		if (!$id) {
+			App::error404();
+		}
+
+		$trackFile = TrackFiles::model()->getByPK($id);
+
+		if ($trackFile->isEmpty() || $trackFile->owner != App::$user->id) {
+			App::error404();
+		}
+
+		$temp = pathinfo($trackFile->filename);
+		$extension = strtolower($temp['extension']);
+
+		self::renderPartial('file.php', array(
+			'filePath' => App::getBasedir(). 'tracks/track' . $id . '.' . $extension,
+			'fileName' => $trackFile->filename,
+		));
 	}
 
 	function actionImportgpx()
diff --git a/views/file.php b/views/file.php
new file mode 100644
index 0000000..6a6aad2
--- /dev/null
+++ b/views/file.php
@@ -0,0 +1,20 @@
+<?php
+
+if (file_exists($filePath)) {
+    if (ob_get_level()) {
+        ob_end_clean();
+    }
+
+	if (!isset($fileName)) {
+		$fileName = basename($filePath);
+	}
+
+    header('Connection: close');
+    header('Content-Type: application/octet-stream');
+    header('Content-Disposition: attachment; filename=' . $fileName);
+    header('Content-Transfer-Encoding: binary');
+    header('Cache-Control: must-revalidate');
+//    header('Transfer-Encoding: chunked');
+    // Читаем файл и отправляем его пользователю
+    readfile($filePath);
+}
diff --git a/views/tracks/files.php b/views/tracks/files.php
index 70e6b6e..6033c01 100644
--- a/views/tracks/files.php
+++ b/views/tracks/files.php
@@ -1,17 +1,9 @@
-<form method="POST" action="/tracks/uploadfile/" enctype="multipart/form-data" class="form-inline">
-	<div class="form-group">
-		<label for="uploadfile">Загрузить новый файл</label>
-		<input type="file" name="file" id="uploadfile" class="form-control" accept=".gpx"/>
-		<button type="submit" class="btn btn-success" title="Загрузить выбранный файл"><span class="glyphicon glyphicon-upload" aria-hidden="true"></span></button>
-	</div>
-</form>
-<hr/>
 <h3>Ваши файлы с треками</h3>
 <?php
 
 if ($files) {
 	foreach ($files as $file) {
-		print $file->id . ' — <span title="' . $file->filename . '">' . $file->name . ' [' . $file->tracksCount.' . ' . $file->tptCount.' . ' . $file->wptCount . '] <a href="/tracks/importgpx/id/' . $file->id . '" title="Импортировать - создать НОВЫЙ трек на карте"><span class="glyphicon glyphicon-import" aria-hidden="true"></span></a><br/>';
+		print $file->id . ' — <span title="' . $file->filename . '">' . $file->name . ' [' . $file->tracksCount.' . ' . $file->tptCount.' . ' . $file->wptCount . '] <a href="/tracks/getfile/id/' . $file->id . '" title="Скачать файл"><span class="glyphicon glyphicon-download" aria-hidden="true"></span></a><br/>';
 	}
 } else {
 	print 'Пока ничего не загружено';
diff --git a/views/tracks/index.php b/views/tracks/index.php
index 432080b..380ad2c 100644
--- a/views/tracks/index.php
+++ b/views/tracks/index.php
@@ -1,5 +1,21 @@
-<h3>Ваши треки</h3>
-<a href="/tracks/files">загрузка треков</a>
+<table style="width: 100%;">
+	<tr>
+		<td>
+			<h3>Ваши треки</h3>
+		</td>
+		<td style="text-align: right;">
+			<form method="POST" action="/tracks/uploadfile/" enctype="multipart/form-data" class="form-inline">
+				<div class="form-group">
+					<label for="uploadfile">Загрузить новый файл</label>
+					<input type="file" name="file" id="uploadfile" class="form-control" accept=".gpx"/>
+					<button type="submit" class="btn btn-success" title="Загрузить выбранный файл"><span class="glyphicon glyphicon-upload" aria-hidden="true"></span></button>
+					&nbsp;
+					<a href="/tracks/files" class="btn btn-default" title="Раздел с файлами треков"><span class="glyphicon glyphicon-download" aria-hidden="true"></span></a>
+				</div>
+			</form>
+		</td>
+	</tr>
+</table>
 <hr/>
 <?php