From 8dccabedaee3450642c58c75101ff52c38508112 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Fri, 1 Aug 2008 04:38:17 +0100 Subject: [PATCH] merge two patches: STRIP_IMAGES and ENABLE_FLASH_PLAYER from Sten (bump schema) --- extras/button/license.txt | 10 ++++++++++ extras/button/musicplayer.swf | Bin 0 -> 6134 bytes extras/button/musicplayer_f6.swf | Bin 0 -> 6463 bytes functions.php | 30 +++++++++++++++++++++++++++--- sanity_check.php | 2 +- schema/ttrss_schema_mysql.sql | 6 +++++- schema/ttrss_schema_pgsql.sql | 6 +++++- 7 files changed, 48 insertions(+), 6 deletions(-) create mode 100644 extras/button/license.txt create mode 100644 extras/button/musicplayer.swf create mode 100644 extras/button/musicplayer_f6.swf diff --git a/extras/button/license.txt b/extras/button/license.txt new file mode 100644 index 00000000..12d609e1 --- /dev/null +++ b/extras/button/license.txt @@ -0,0 +1,10 @@ +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/extras/button/musicplayer.swf b/extras/button/musicplayer.swf new file mode 100644 index 0000000000000000000000000000000000000000..39c8d5398aa25ece769fdac328caa62370b4f24a GIT binary patch literal 6134 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 I1za3t@9`?^Z~y=R literal 0 HcmV?d00001 diff --git a/extras/button/musicplayer_f6.swf b/extras/button/musicplayer_f6.swf new file mode 100644 index 0000000000000000000000000000000000000000..2eb5d579681cecbddbcff1fcabbc502345b1d9a5 GIT binary patch literal 6463 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
}cmX(9SD_*6cuQ&PQuu{6OtCeTMBh&zH_c z!B&Y!?r6x>A?6Fs^tC13sWPK7+%;@VT-U@>F`e@wToi(ot#@awWq`E;8d}XBd!v?G zm{I}q*yqf^OxZ1A`dnc7=bRk$l)@Cwt$v+2$ea(o02x`2FQ7LJ@W=1@Xl=|#+j+Az z%!Gj22cR1*sN?M`wH-w%GYe>rw+YKO-X#!VzRzIDY&~1O&e*;g4Rn#6;frx#J)?OEHnvy=`K6uoRS$bSdRZrZ zOTofs0oJy9h=(3@xmkVDXd+6^4o_$sE1RAr`DcN#zccJ~)e7^aa=;4w%-?oXUIV_3 zY_*mUsq6n5xwf4IVj$Y>u38lFhL`9@Q3+nY0dyk|zUXd5Up3Kaj0q1$dGQbU0Au_m zzsN_O&UAVa6&@ftvt`@DboMZvQ~r1ooGud;ewPxtC1(oXDrL-OfoV4=^C-G|;!QFS1<4usf&Mw>+5 zzS#R;LHv17(@NBkpAuaqJ^6JPn6)^$FliOHl{Ik4gMU`TZ^^b{%;{EoCXaJS?>Q`O zExrqzaVx}0MlOs0>&L*i#`1!|xb}Yr6X^Q|?>9<_90gYuNL6AmsS_UzrT|PaC<7=n znAS{%K?OjC!3=;IUdyvyQRx-tdgmsLq+k}^dA>t20%_Dj;+SAwU|>%KmaN%>^h6@q9Iz&`1brbPc7h;6- zPtvzl5jZ

"); } + if (get_pref($link, "STRIP_IMAGES")) { + + $res = preg_replace('/]+>/is', '', $res); + + } + return $res; } @@ -4704,7 +4710,16 @@ $filename = substr($url, strrpos($url, "/")+1); - $entry = "" . + $entry = ""; + + if (($ctype = __("audio/mpeg")) && + (get_pref($link, "ENABLE_FLASH_PLAYER")) ) { + + $entry .= " "; + + } + + $entry .= "" . $filename . " (" . $ctype . ")" . ""; array_push($entries, $entry); @@ -5139,7 +5154,7 @@ // print "
"; - print $line["content_preview"]; + print sanitize_rss($line["content_preview"]); $e_result = db_query($link, "SELECT * FROM ttrss_enclosures WHERE post_id = '$id' AND content_url != ''"); @@ -5163,7 +5178,16 @@ $filename = substr($url, strrpos($url, "/")+1); - $entry = "" . + $entry = ""; + + if (($ctype = __("audio/mpeg")) && + (get_pref($link, "ENABLE_FLASH_PLAYER")) ) { + + $entry .= " "; + + } + + $entry .= "" . $filename . " (" . $ctype . ")" . ""; array_push($entries, $entry); diff --git a/sanity_check.php b/sanity_check.php index ee715a82..1afd28d9 100644 --- a/sanity_check.php +++ b/sanity_check.php @@ -2,7 +2,7 @@ require_once "functions.php"; define('EXPECTED_CONFIG_VERSION', 17); - define('SCHEMA_VERSION', 38); + define('SCHEMA_VERSION', 39); if (!file_exists("config.php")) { print __("Fatal Error: You forgot to copy diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql index 59a8c83b..c2a5ce58 100644 --- a/schema/ttrss_schema_mysql.sql +++ b/schema/ttrss_schema_mysql.sql @@ -209,7 +209,7 @@ create table ttrss_tags (id integer primary key auto_increment, create table ttrss_version (schema_version int not null) TYPE=InnoDB; -insert into ttrss_version values (38); +insert into ttrss_version values (39); create table ttrss_enclosures (id serial not null primary key, content_url text not null, @@ -334,6 +334,10 @@ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('SYNC_COUNTERS', 1, 'false', 'Prefer more accurate feedlist counters to UI speed',3); +insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('STRIP_IMAGES', 1, 'false', 'Do not show images in articles', 2); + +insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('ENABLE_FLASH_PLAYER', 1, 'false', 'Enable inline MP3 player', 3, 'Enable the Flash-based XSPF Player to play MP3-format podcast enclosures.'); + create table ttrss_user_prefs ( owner_uid integer not null, pref_name varchar(250), diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql index c0cddfba..ba5ebac2 100644 --- a/schema/ttrss_schema_pgsql.sql +++ b/schema/ttrss_schema_pgsql.sql @@ -189,7 +189,7 @@ create index ttrss_tags_owner_uid_index on ttrss_tags(owner_uid); create table ttrss_version (schema_version int not null); -insert into ttrss_version values (38); +insert into ttrss_version values (39); create table ttrss_enclosures (id serial not null primary key, content_url text not null, @@ -308,6 +308,10 @@ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('SYNC_COUNTERS', 1, 'false', 'Prefer more accurate feedlist counters to UI speed',3); +insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('STRIP_IMAGES', 1, 'false', 'Do not show images in articles', 2); + +insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('ENABLE_FLASH_PLAYER', 1, 'false', 'Enable inline MP3 player', 3, 'Enable the Flash-based XSPF Player to play MP3-format podcast enclosures.'); + create table ttrss_user_prefs ( owner_uid integer not null references ttrss_users(id) ON DELETE CASCADE, pref_name varchar(250) not null references ttrss_prefs(pref_name) ON DELETE CASCADE,