fix newlines in synopsis

git-svn-id: file:///root/webif/svn/pkg/webif/trunk@2444 2a923420-c742-0410-a762-8d5b09965624
This commit is contained in:
hummypkg 2015-07-07 19:32:01 +00:00
parent 0c3af11f45
commit 91a7f66d9c
5 changed files with 18 additions and 7 deletions

View File

@ -1,7 +1,7 @@
Package: webif
Priority: optional
Section: web
Version: 1.2.3-3
Version: 1.2.3-4
Architecture: mipsel
Maintainer: af123@hummypkg.org.uk
Depends: webif-channelicons(>=1.1.18),lighttpd(>=1.4.35-2),jim(>=0.76),jim-oo,jim-sqlite3(>=0.76),jim-cgi(>=0.7),jim-binary(>=0.76),service-control(>=2.1),busybox(>=1.20.2-1),lsof(>=4.87),epg(>=1.2.0),hmt(>=2.0.3),ssmtp,anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),webif-charts(>=1.2-1),stripts(>=1.2.5-3),smartmontools,tmenu(>=1.08),ffmpeg,id3v2,multienv(>=1.6),tcpping(>=1.1),e2fsprogs,wireless-tools(>=29-1),dbupdate,recmon(>2.0.3-3),auto-unprotect(>=2.0.0-1)

View File

@ -10,10 +10,14 @@ set file [cgi_get file]
if {$file == 0} exit
set ts [ts fetch $file]
proc esc {str} {
return [string map {"\n" " "} $str]
}
puts "{"
puts "\"title\" : \"[$ts get title]\","
puts "\"synopsis\" : \"[$ts get synopsis]\","
puts "\"guidance\" : \"[$ts get guidance]\","
puts "\"genre\" : [$ts get genre]"
puts "\"title\" : \"[esc [$ts get title]]\","
puts "\"synopsis\" : \"[esc [$ts get synopsis]]\","
puts "\"guidance\" : \"[esc [$ts get guidance]]\","
puts "\"genre\" : [esc [$ts get genre]]"
puts "}"

View File

@ -23,7 +23,8 @@ if {[file isdirectory $file]} {
foreach attr {title synopsis guidance genre} {
if {[catch {
set new [string trim [cgi_get "rename_$attr"]]
set new [string map {"\n" ""} [
string trim [cgi_get "rename_$attr"]]]
set old [$ts get $attr]
if {$new ne $old} {
if {$attr eq "guidance" ||

View File

@ -419,6 +419,10 @@ function flagdir(file, flag, iconset, output, options)
$(function() {
$('textarea').keydown(function(e) {
return e.keyCode != 13;
});
dir = $('#dir').text();
var menuclick = function(action, el, pos)

View File

@ -177,7 +177,9 @@ foreach plugin [lsort [glob -nocomplain /mod/webif/plugin/*]] {
if {[file isfile "$plugin/$hook.hook"]} {
puts "<h4>Settings for <i>[file tail $plugin]</i> package</h4>"
puts "<div class=pluginsettings>"
catch {source "$plugin/$hook.hook"}
if {[catch {source "$plugin/$hook.hook"} msg]} {
puts "ERROR: $msg"
}
puts "</div>"
}
}