From af3aa3aa7c4bb7ba5ff4904f7120984b9d861937 Mon Sep 17 00:00:00 2001
From: Ricsi <tricsusz@gmail.com>
Date: Wed, 12 Apr 2017 22:13:20 +0200
Subject: [PATCH] added backup delete option

---
 _class/class_backup.php                  |   9 ++
 _class/class_page.php                    |   4 +
 _image/download.png                      | Bin 0 -> 3546 bytes
 _include/include_delete_backup.php       |  12 ++
 _include/include_settings.php            |   2 +-
 backup/.gitkeep                          |   0
 template/templates/setting_data_edit.tpl | 138 ++++++++++++++++++-----
 template/templates/user_list.tpl         |   1 -
 8 files changed, 138 insertions(+), 28 deletions(-)
 create mode 100644 _image/download.png
 create mode 100644 _include/include_delete_backup.php
 create mode 100755 backup/.gitkeep

diff --git a/_class/class_backup.php b/_class/class_backup.php
index 2a86cab..687dbec 100644
--- a/_class/class_backup.php
+++ b/_class/class_backup.php
@@ -4,6 +4,7 @@ class backup {
 	private $bu_id;
 	private $bu_name;
 	private $bu_date;
+	private $bu_deleted;
 
 
 	public function set_bu_id($_item) {
@@ -18,6 +19,10 @@ class backup {
 		$this->bu_date = $_item;
 	}
 
+	public function set_bu_deleted($_item) {
+		$this->bu_deleted = $_item;
+	}
+
 	public function get_bu_id() {
 		return $this->bu_id;
 	}
@@ -30,6 +35,10 @@ class backup {
 		return $this->bu_date;
 	}
 
+	public function get_bu_deleted() {
+		return $this->bu_deleted;
+	}
+
 	public function set_backup_data_by_id($_id) {
 		//SETTING ID ALAPJÁN KÉRI LE;
 		//HA KELL, LEHET KÜLÖN FUNCTION-T ÍRNI HOGY ID ALAPJÁN KÉRJE
diff --git a/_class/class_page.php b/_class/class_page.php
index 9c6859f..8a684c5 100755
--- a/_class/class_page.php
+++ b/_class/class_page.php
@@ -204,6 +204,10 @@ class page {
 								# BEFIZETÉS TÖRLÉS
 								include('include_delete_money_expense.php');
 								break;
+							case 'delete_backup':
+								# MENTÉS TÖRLÉS
+								include('include_delete_backup.php');
+								break;
 							case 'logout':
 								# kijelentkezés
 								$from = "coach";
diff --git a/_image/download.png b/_image/download.png
new file mode 100644
index 0000000000000000000000000000000000000000..c1ef2853d66fdede5d654de295faacc7755c7cf9
GIT binary patch
literal 3546
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
OSJr3kEUV1D?)(dC<d%8>

literal 0
HcmV?d00001

diff --git a/_include/include_delete_backup.php b/_include/include_delete_backup.php
new file mode 100644
index 0000000..006dadc
--- /dev/null
+++ b/_include/include_delete_backup.php
@@ -0,0 +1,12 @@
+<?php
+
+if ($this->is_id()) {
+	//$delete_query = "DELETE FROM user_kid WHERE uk_id = " . $this->get_id() . ";";
+	//$sql->execute_query($delete_query);
+	$sql->update_table('backup', array('bu_deleted' => 1), array('bu_id' => $this->get_id()));
+	log::register('delete_backup', $this->get_id());
+	header("Location: /admin/settings/3");
+}
+
+
+?>
\ No newline at end of file
diff --git a/_include/include_settings.php b/_include/include_settings.php
index 1627141..119f0d6 100644
--- a/_include/include_settings.php
+++ b/_include/include_settings.php
@@ -23,7 +23,7 @@ if ($this->is_id()) {
 
 	elseif ($new_setting->get_setv_setting()->get_set_setting_type_st_id() == 2) {
 		//biztonsági mentés
-		$backup_assoc_array = $sql->assoc_array("SELECT * FROM backup ORDER BY bu_date DESC, bu_id DESC limit 14;");
+		$backup_assoc_array = $sql->assoc_array("SELECT * FROM backup WHERE bu_deleted = 0 ORDER BY bu_date DESC, bu_id DESC limit 14;");
 		$backups = array();
 		foreach ($backup_assoc_array as $value) {
 			$new_backup = new backup();
diff --git a/backup/.gitkeep b/backup/.gitkeep
new file mode 100755
index 0000000..e69de29
diff --git a/template/templates/setting_data_edit.tpl b/template/templates/setting_data_edit.tpl
index ac42951..095d621 100644
--- a/template/templates/setting_data_edit.tpl
+++ b/template/templates/setting_data_edit.tpl
@@ -1,25 +1,31 @@
-<div class="full_width">
-	<form method="post">
-		<input type="hidden" name="action" value="settings_data_edit">
-		<input type="hidden" name="set_id" value="{$setting->get_setv_setting_set_id()}">
-		<input type="hidden" name="setv_id" value="{$setting->get_setv_id()}">
-		<input type="hidden" name="st_name" value="{$setting->get_setv_setting()->get_set_setting_type()->get_st_setting_data_type()}">
 
 
 			
 		{if $setting->get_setv_setting()->get_set_setting_type_st_id() == 1}
-			<div>
-				<div class="full_width">
-						<textarea name="set_val" id="set_val">{$setting->get_setv_text()}</textarea>
-				</div>
+			<div class="full_width">
+				<form method="post">
+					<input type="hidden" name="action" value="settings_data_edit">
+					<input type="hidden" name="set_id" value="{$setting->get_setv_setting_set_id()}">
+					<input type="hidden" name="setv_id" value="{$setting->get_setv_id()}">
+					<input type="hidden" name="st_name" value="{$setting->get_setv_setting()->get_set_setting_type()->get_st_setting_data_type()}">
+					<div>
+						<div class="full_width">
+								<textarea name="set_val" id="set_val">{$setting->get_setv_text()}</textarea>
+						</div>
+					</div>
+
+					
+					<div>
+						<div class="right">
+					  		<input class="button black" type="submit" value="Mentés">
+					    </div>
+					</div>
+				</form>
 			</div>
 
-			
-			<div>
-				<div class="right">
-			  		<input class="button black" type="submit" value="Mentés">
-			    </div>
-			</div>
+			 <script>
+			    CKEDITOR.replace( 'set_val' );
+			</script>
 
 		{elseif $setting->get_setv_setting()->get_set_setting_type_st_id() == 2}
 
@@ -31,20 +37,100 @@
 			<div class="list">
 
 			{foreach $backups as $backup}
-				<a href="/backup/{$backup->get_bu_name()}.sql">
-					<div class="list_item">
-						<img src="/_image/backup.png">
-						<span class="bold">{$backup->get_bu_date()|date_format:"%Y.%m.%d %H:%M"}</span> #{$backup->get_bu_id()} 
-					</div>
-				</a>
+				{if 
+				$backup@first ||
+				(
+				$backups[$backup@index]->get_bu_date()|substr:5:2 != $backups[$backup@index-1]->get_bu_date()|substr:5:2 
+				)
+				
+				}
+				{if !$backup@first && 
+				$backups[$backup@index]->get_bu_date()|substr:5:2 != $backups[$backup@index-1]->get_bu_date()|substr:5:2
+				}
+				</div>
+				{/if}
+				<span onclick="block_action('block_{$backup->get_bu_date()|substr:0:4}{$backup->get_bu_date()|substr:5:2}');" class="date_separator clickable">{$backups[$backup@index]->get_bu_date()|substr:0:4}. 
+					{$months[$backups[$backup@index]->get_bu_date()|substr:5:2]}
+					<img src="/_image/open_folder.png">
+				</span>
+				<div id="block_{$backup->get_bu_date()|substr:0:4}{$backup->get_bu_date()|substr:5:2}" class="month_block">
+				{/if}
+				<div class="list_item clickable" id="kid_{$backup->get_bu_id()}" onclick="open_kid_menu({$backup->get_bu_id()})">
+					<img src="/_image/backup.png">
+					<span class="bold">{$backup->get_bu_date()|date_format:"%Y.%m.%d %H:%M"}</span> #{$backup->get_bu_id()} 
+				</div>
+				<div class="kid_menu" id="kid_menu_{$backup->get_bu_id()}">
+					<div class="kid_submenu" onclick="download_backup('{$backup->get_bu_name()}')">
+				  		<span>Letöltés</span>
+				  		<img src="/_image/download.png">
+			  		</div>
+			  		<div class="kid_submenu" onclick="delete_backup('{$backup->get_bu_id()}')">
+				  		<span>Törlés</span>
+				  		<img src="/_image/delete.png">
+			  		</div>
+				</div>
+				{if $backup@last}
+				</div>
+				{/if}
 			{/foreach}
 			</div>
 
 		{/if}
 
-	</form>
-</div>
 
- <script>
-    CKEDITOR.replace( 'set_val' );
+
+
+
+<script>
+
+function open_block(block_id) {
+	$("#"+block_id).slideDown("slow");
+}
+
+function close_block(block_id) {
+	$("#"+block_id).slideUp("slow");
+}
+
+function block_action(block_id) {
+	if ($("#"+block_id).is(':hidden')) {
+		open_block(block_id);
+	}
+	else {
+		close_block(block_id);
+	}
+}
+
+function download_backup(bu_name) {
+	window.open("/backup/"+bu_name+".sql", '_blank');
+}
+
+function delete_backup(bu_id) {
+	location.href = "/admin/delete_backup/"+bu_id;
+}
+
+
+$( document ).ready(function() {
+    var divs = $( "div[class=month_block]" );
+	$( ".list" ).find( divs ).hide();
+	var div_list = $( ".list" ).find( divs );
+
+	open_block(div_list[0].id);
+	
+});
+
+
+function open_kid_menu(uk_id) {
+	$("#kid_menu_"+uk_id).slideToggle();
+	if (!$("#kid_"+uk_id).hasClass('active_kid')) {
+		$("#kid_"+uk_id).addClass('active_kid');
+		$("#kid_"+uk_id).removeClass('list_item');
+	}
+	else {
+		$("#kid_"+uk_id).removeClass('active_kid');
+		$("#kid_"+uk_id).addClass('list_item');
+	}
+
+}
+
+
 </script>
\ No newline at end of file
diff --git a/template/templates/user_list.tpl b/template/templates/user_list.tpl
index f7295dc..345068b 100755
--- a/template/templates/user_list.tpl
+++ b/template/templates/user_list.tpl
@@ -46,7 +46,6 @@ $("#uk_filter_name").keyup(function() {
 
 function open_kid_menu(uk_id) {
 	$("#kid_menu_"+uk_id).slideToggle();
-	console.log($(this));
 	if (!$("#kid_"+uk_id).hasClass('active_kid')) {
 		$("#kid_"+uk_id).addClass('active_kid');
 		$("#kid_"+uk_id).removeClass('list_item');