From df47100ad10117f67dd0fb86f270cdd2d24b5692 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Wed, 20 Jun 2018 18:17:44 +0300
Subject: remove SWF enclosure audio player

---
 include/controls.php          |  12 ++----------
 lib/button/license.txt        |  10 ----------
 lib/button/musicplayer.swf    | Bin 6134 -> 0 bytes
 lib/button/musicplayer_f6.swf | Bin 6463 -> 0 bytes
 4 files changed, 2 insertions(+), 20 deletions(-)
 delete mode 100644 lib/button/license.txt
 delete mode 100644 lib/button/musicplayer.swf
 delete mode 100644 lib/button/musicplayer_f6.swf

diff --git a/include/controls.php b/include/controls.php
index b416f4d22..037e331cc 100755
--- a/include/controls.php
+++ b/include/controls.php
@@ -94,7 +94,7 @@ function print_feed_multi_select($id, $default_ids = [],
 				(SELECT COUNT(id) FROM ttrss_feed_categories AS c2 WHERE
 					c2.parent_cat = ttrss_feed_categories.id) AS num_children
 				FROM ttrss_feed_categories
-				WHERE owner_uid = :uid AND 
+				WHERE owner_uid = :uid AND
 				(parent_cat = :root_id OR (:root_id IS NULL AND parent_cat IS NULL)) ORDER BY title");
 
 		$sth->execute([":uid" => $_SESSION['uid'], ":root_id" => $root_id]);
@@ -188,7 +188,7 @@ function print_feed_cat_select($id, $default_id,
 				(SELECT COUNT(id) FROM ttrss_feed_categories AS c2 WHERE
 					c2.parent_cat = ttrss_feed_categories.id) AS num_children
 				FROM ttrss_feed_categories
-				WHERE owner_uid = :uid AND 
+				WHERE owner_uid = :uid AND
 				  (parent_cat = :root_id OR (:root_id IS NULL AND parent_cat IS NULL)) ORDER BY title");
 	$sth->execute([":uid" => $_SESSION['uid'], ":root_id" => $root_id]);
 
@@ -293,14 +293,6 @@ function format_inline_player($url, $ctype) {
 					<source type=\"$ctype\" src=\"$url\"/>
 					</audio>";
 
-		} else {
-
-			$entry .= "<object type=\"application/x-shockwave-flash\"
-					data=\"lib/button/musicplayer.swf?song_url=$url\"
-					width=\"17\" height=\"17\" style='float : left; margin-right : 5px;'>
-					<param name=\"movie\"
-						value=\"lib/button/musicplayer.swf?song_url=$url\" />
-					</object>";
 		}
 
 		if ($entry) $entry .= "&nbsp; <a target=\"_blank\" rel=\"noopener noreferrer\"
diff --git a/lib/button/license.txt b/lib/button/license.txt
deleted file mode 100644
index 12d609e12..000000000
--- a/lib/button/license.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Copyright (c) 2005, Fabricio Zuardi
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-    * Neither the name of the author nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/lib/button/musicplayer.swf b/lib/button/musicplayer.swf
deleted file mode 100644
index 39c8d5398..000000000
Binary files a/lib/button/musicplayer.swf and /dev/null differ
diff --git a/lib/button/musicplayer_f6.swf b/lib/button/musicplayer_f6.swf
deleted file mode 100644
index 2eb5d5796..000000000
Binary files a/lib/button/musicplayer_f6.swf and /dev/null differ
-- 
cgit v1.2.3-54-g00ecf