Skip to content

Commit

Permalink
merge two patches: STRIP_IMAGES and ENABLE_FLASH_PLAYER from Sten (bu…
Browse files Browse the repository at this point in the history
…mp schema)
  • Loading branch information
Andrew Dolgov committed Aug 1, 2008
1 parent e5ebee0 commit 8dccabe
Show file tree
Hide file tree
Showing 7 changed files with 48 additions and 6 deletions.
10 changes: 10 additions & 0 deletions extras/button/license.txt
Original file line number Diff line number Diff line change
@@ -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.
Binary file added extras/button/musicplayer.swf
Binary file not shown.
Binary file added extras/button/musicplayer_f6.swf
Binary file not shown.
30 changes: 27 additions & 3 deletions functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -3522,6 +3522,12 @@ function sanitize_rss($link, $str, $force_strip_tags = false) {
// $res = strip_tags_long($res, "<p><a><i><em><b><strong><blockquote><br><img><div><span>");
}

if (get_pref($link, "STRIP_IMAGES")) {

$res = preg_replace('/<img[^>]+>/is', '', $res);

}

return $res;
}

Expand Down Expand Up @@ -4704,7 +4710,16 @@ function outputArticleXML($link, $id, $feed_id, $mark_as_read = true) {

$filename = substr($url, strrpos($url, "/")+1);

$entry = "<a target=\"_blank\" href=\"" . htmlspecialchars($url) . "\">" .
$entry = "";

if (($ctype = __("audio/mpeg")) &&
(get_pref($link, "ENABLE_FLASH_PLAYER")) ) {

$entry .= "<object type=\"application/x-shockwave-flash\" data=\"extras/button/musicplayer.swf?song_url=$url\" width=\"20\" height=\"20\"> <param name=\"movie\" value=\"extras/button/musicplayer.swf?song_url=$url\" /> </object>";

}

$entry .= "<a target=\"_blank\" href=\"" . htmlspecialchars($url) . "\">" .
$filename . " (" . $ctype . ")" . "</a>";

array_push($entries, $entry);
Expand Down Expand Up @@ -5139,7 +5154,7 @@ class=\"markedPic\"

// print "<div class=\"cdmInnerContent\" id=\"CICD-$id\" $cdm_cstyle>";

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 != ''");
Expand All @@ -5163,7 +5178,16 @@ class=\"markedPic\"

$filename = substr($url, strrpos($url, "/")+1);

$entry = "<a target=\"_blank\" href=\"" . htmlspecialchars($url) . "\">" .
$entry = "";

if (($ctype = __("audio/mpeg")) &&
(get_pref($link, "ENABLE_FLASH_PLAYER")) ) {

$entry .= "<object type=\"application/x-shockwave-flash\" data=\"extras/button/musicplayer.swf?song_url=$url\" width=\"20\" height=\"20\"> <param name=\"movie\" value=\"extras/button/musicplayer.swf?song_url=$url\" /> </object>";

}

$entry .= "<a target=\"_blank\" href=\"" . htmlspecialchars($url) . "\">" .
$filename . " (" . $ctype . ")" . "</a>";

array_push($entries, $entry);
Expand Down
2 changes: 1 addition & 1 deletion sanity_check.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 __("<b>Fatal Error</b>: You forgot to copy
Expand Down
6 changes: 5 additions & 1 deletion schema/ttrss_schema_mysql.sql
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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),
Expand Down
6 changes: 5 additions & 1 deletion schema/ttrss_schema_pgsql.sql
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit 8dccabe

Please sign in to comment.