remove SSI

git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@1837 2a923420-c742-0410-a762-8d5b09965624
This commit is contained in:
hummypkg 2014-04-14 22:54:01 +00:00
parent 5f473c9e72
commit 17ba0bb00e
38 changed files with 138 additions and 126 deletions

View File

@ -2,7 +2,7 @@
package require cgi
source /mod/webif/lib/setup
require system.class chunked pretty_size
require system.class pretty_size
cgi_input
#cgi_dump
@ -10,16 +10,14 @@ cgi_input
set file [cgi_get file "-"]
if {$file eq "-"} { exit }
start_chunked
httpheader "text/plain"
if {![file exists $file]} {
chunk ">>> File $file does not exist.\r\n"
puts ">>> File $file does not exist.\r\n"
} else {
chunk ">>> Contents of $file [pretty_size [file size $file]]\r\n"
puts ">>> Contents of $file [pretty_size [file size $file]]\r\n"
set fp [open $file r]
chunk [read $fp]
puts [read $fp]
close $fp
}
end_chunked

View File

@ -63,7 +63,7 @@ proc db_info {db_file} {
if {$fdb == 0} {
puts "Please choose database to view:<ul>"
foreach db $databases {
puts "<li><a href=$::env(REQUEST_URI)?db=[file tail $db]>
puts "<li><a href=$::env(SCRIPT_NAME)?db=[file tail $db]>
$db</a></li>"
}
puts "</ul>"

View File

@ -13,7 +13,7 @@ set raw [cgi_get raw]
puts "<pre>"
if { $raw == 0 } {
puts [epg exec dump -raw 1 -service $service -event $event]
puts "<a href=$env(REQUEST_URI)?$env(QUERY_STRING)&raw=1>
puts "<a href=$env(SCRIPT_NAME)?$env(QUERY_STRING)&raw=1>
Click here for extended dump</a>"
} else {
puts [epg exec dumpraw -raw 1 -service $service -event $event]

View File

@ -2,7 +2,7 @@
package require cgi
source /mod/webif/lib/setup
require pkg.class chunked
require pkg.class
cgi_input
#cgi_dump
@ -10,30 +10,27 @@ cgi_input
set cmd [cgi_get cmd update]
proc opkg {cmd} {
chunk ">>> opkg $cmd\r\n"
puts ">>> opkg $cmd\r\n"
set bcmd "|/mod/webif/lib/bin/opkg $cmd"
set fd [open $bcmd r]
while {[gets $fd line] >= 0} {
chunk "$line\r\n"
#chunk_pad
puts "$line\r\n"
}
close $fd
chunk "\r\n"
puts "\r\n"
}
start_chunked
httpheader "text/plain"
if {$cmd eq "upgrade"} { opkg update }
opkg $cmd
if {$cmd eq "update" || $cmd eq "upgrade"} {
chunk "Updating package meta information\r\n"
puts "Updating package meta information\r\n"
pkg fetchmeta
chunk "Done.\r\n"
chunk "Updating diagnostic meta information\r\n"
puts "Done.\r\n"
puts "Updating diagnostic meta information\r\n"
pkg fetchdiagmeta
chunk "Done.\r\n"
puts "Done.\r\n"
}
end_chunked

View File

@ -52,7 +52,7 @@ set audiomp3 [$settings audiomp3]
# Handle updates
if {![dict exists $env REQUEST_URI]} { set env(REQUEST_URI) "" }
if {![dict exists $env SCRIPT_NAME]} { set env(SCRIPT_NAME) "" }
proc _handle_update {class var old text} {
global _cgi
@ -161,7 +161,7 @@ puts "
puts "
<tr>
<form class=auto id=hostname method=get action=$env(REQUEST_URI)>
<form class=auto id=hostname method=get action=$env(SCRIPT_NAME)>
<th class=key>Hostname</th>
<td><input name=hostname value=\"$hostname\"
class=\"text ui-widget-content ui-corner-all\"
@ -189,7 +189,7 @@ if {[system pkginst ir]} {
puts -nonewline "
<tr>
<form class=auto id=autolog method=get action=$env(REQUEST_URI)>
<form class=auto id=autolog method=get action=$env(SCRIPT_NAME)>
<th class=key>Auto-processing log level</th>
<td><select id=autolog name=autolog
class=\"text ui-widget-content ui-corner-all\">
@ -216,7 +216,7 @@ puts "
puts -nonewline "
<tr>
<form class=auto id=audiomp3 method=get action=$env(REQUEST_URI)>
<form class=auto id=audiomp3 method=get action=$env(SCRIPT_NAME)>
<th class=key>Audio extraction type</th>
<td><select id=audiomp3 name=audiomp3
class=\"text ui-widget-content ui-corner-all\">
@ -251,7 +251,7 @@ puts "
puts "
<tr>
<form class=auto id=epg_style method=get action=$env(REQUEST_URI)>
<form class=auto id=epg_style method=get action=$env(SCRIPT_NAME)>
<th class=key>Default Now/Next style</th>
<td><select id=epg_style name=epg_style
class=\"text ui-widget-content ui-corner-all\">
@ -275,7 +275,7 @@ puts "
puts "
<tr>
<form class=auto id=service_style method=get action=$env(REQUEST_URI)>
<form class=auto id=service_style method=get action=$env(SCRIPT_NAME)>
<th class=key>Default Single-channel style</th>
<td><select id=service_style name=service_style
class=\"text ui-widget-content ui-corner-all\">
@ -299,7 +299,7 @@ puts "
puts "
<tr>
<form class=auto id=channel_group method=get action=$env(REQUEST_URI)>
<form class=auto id=channel_group method=get action=$env(SCRIPT_NAME)>
<th class=key>Channel Group for EPG</th>
<td><select id=channel_group name=channel_group
class=\"text ui-widget-content ui-corner-all\">
@ -329,7 +329,7 @@ puts "
puts "
<tr>
<form class=auto id=xepghours method=get action=$env(REQUEST_URI)>
<form class=auto id=xepghours method=get action=$env(SCRIPT_NAME)>
<th class=key>Grid-style EPG Hours</th>
<td><select id=xepghours name=xepghours
class=\"text ui-widget-content ui-corner-all\">
@ -369,7 +369,7 @@ puts "
#
#puts "
# <tr>
# <form class=auto id=smtp_server method=get action=$env(REQUEST_URI)>
# <form class=auto id=smtp_server method=get action=$env(SCRIPT_NAME)>
# <th class=key>SMTP Server for outbound email</th>
# <td><input name=smtp_server value=\"$smtp_server\"
# class=\"text ui-widget-content ui-corner-all\"
@ -427,7 +427,7 @@ if {[llength $aclusers]} {
puts "<tr><th colspan=5 class=odd>Add New User</th></tr>"
puts "
<form id=aclnewuser method=get action=$env(REQUEST_URI)>
<form id=aclnewuser method=get action=$env(SCRIPT_NAME)>
<tr><th class=key>New User:</th><td>
<input
class=\"text ui-widget-content ui-corner-all\"

View File

@ -1,7 +1,7 @@
$(function() {
$('#epgswitch').button().click(function() {
window.location = '/epg.shtml';
window.location = '/epg/list.jim';
});
$('button.nav').click(function() {

View File

@ -1,4 +0,0 @@
<!--#include virtual="/lib/header.shtml" -->
<!--#exec cmd="/mod/webif/include/backup.jim" -->
<!--#include virtual="/lib/footer.shtml" -->

View File

@ -1,7 +1,7 @@
function refresh_files()
{
$('#backup_files').load('/cgi-bin/backup/files.jim', function() {
$('#backup_files').load('files.jim', function() {
$('input.restore').change(function() {
$('#restore_button').removeAttr('disabled')
.button('option', 'disabled', false);
@ -20,7 +20,7 @@ $(document).ready(function() {
$('#backup_button').click(function() {
$('#backup_working').slideDown();
$('#results').load('/cgi-bin/backup/backup.jim?' +
$('#results').load('backup.jim?' +
$('#backup_name').serialize(), function() {
$('#results').slideDown(function() {
$('#backup_working').slideUp();
@ -32,7 +32,7 @@ $(document).ready(function() {
var backup = $('input.restore:checked').val();
if (confirm('Confirm deletion of ' + backup))
{
$('#results').load('/cgi-bin/backup/delete.jim?' +
$('#results').load('delete.jim?' +
$('input.restore').serialize(), function() {
$('#results').slideDown(function() {
refresh_files();
@ -42,7 +42,7 @@ $(document).ready(function() {
});
$('#view_button').click(function() {
var backup = $('input.restore:checked').val();
$('#results').load('/cgi-bin/backup/view.jim?' +
$('#results').load('view.jim?' +
$('input.restore').serialize(), function() {
$('#results').slideDown(function() {
refresh_files();
@ -54,7 +54,7 @@ $(document).ready(function() {
if (confirm('!!!!!!!!!!!!!!!!!!!!!!!!! PLEASE CONFIRM !!!!!!!!!!!!!!!!!!!!!!!!!\n\nAre you sure you wish to erase all scheduled recordings and favourite channels and then restore them from\n' + backup + '?'))
{
$('#restore_working').slideDown();
$('#results').load('/cgi-bin/backup/restore.jim?' +
$('#results').load('restore.jim?' +
$('input.restore').serialize(), function() {
$('#results').slideDown(function() {
$('#restore_working').slideUp();

View File

@ -3,8 +3,9 @@
source /mod/webif/lib/setup
require altrow rsv.class
noheader
jscss /cgi-bin/backup/backup.js
jscss backup.js
header
puts {
<h2>Backup/Restore</h2>
@ -65,3 +66,5 @@ puts {
</div>
}
footer

View File

@ -14,8 +14,8 @@ set flatten [system pkginst flatten]
set ignore {.nts .thm .hmi}
set include {.ts .avi .mpg .mpeg .wmv .mkv .mp3 .mp4 .mov .hmt}
if {![dict exists $env REQUEST_URI]} {
set env(REQUEST_URI) ""
if {![dict exists $env SCRIPT_NAME]} {
set env(SCRIPT_NAME) ""
cgi_input
set _cgi(dir) "/media/My Video/"
}
@ -52,7 +52,7 @@ proc directory {file bfile tbfile} {
if {!$::nofcount} { puts "<span class=foldernum></span>" }
puts "<input class=\"fs fsdir\" type=checkbox>"
puts "<a class=dbf
href=\"$::env(REQUEST_URI)?dir=[cgi_quote_url $file]\"
href=\"$::env(SCRIPT_NAME)?dir=[cgi_quote_url $file]\"
file=\"[cgi_quote_url $file]\">"
puts "$bfile</a><span class=filesize id=\"$tbfile\">
</span>"
@ -264,7 +264,7 @@ set stub ""
foreach part [split $dir /] {
if {$stub eq "/"} { set name $part } else { set name "/$part" }
append stub $name
puts "<a href=\"$env(REQUEST_URI)?dir=[cgi_quote_url $stub]\">$name</a>
puts "<a href=\"$env(SCRIPT_NAME)?dir=[cgi_quote_url $stub]\">$name</a>
}
puts "<span class=filesize id=dirsize></span>"
puts "</legend>"
@ -274,7 +274,7 @@ set parent [join [lrange [split $dir /] 0 end-1] /]
if {$parent ne ""} {
puts "
<div class=va>
<a href=\"$env(REQUEST_URI)?dir=[cgi_quote_url $parent]\">
<a href=\"$env(SCRIPT_NAME)?dir=[cgi_quote_url $parent]\">
<img border=0 src=/images/711_3_09_Media_Folder_UP.png class=va>
\[parent directory\]</a>
</div>
@ -333,7 +333,7 @@ foreach sl $sortlist {
set tag "Currently sorting"
if {$order != $index} {
puts "
<a href=\"$env(REQUEST_URI)?$env(QUERY_STRING)&order=$index\">"
<a href=\"$env(SCRIPT_NAME)?$env(QUERY_STRING)&order=$index\">"
set tag "Sort"
}
puts "<img class=va border=0 src=/img/$img.gif> $tag by $descr"

View File

@ -1 +0,0 @@
../lib/jquery.iphone-style-checkboxes/iphone-style-checkboxes.css

View File

@ -2,32 +2,28 @@
package require cgi
source /mod/webif/lib/setup
require system.class chunked
require system.class
cgi_input
#cgi_dump
set diag [cgi_get diag general]
start_chunked
httpheader "text/plain"
if {[system modversion 1] < 113} {
chunk ">>> Diagnostics only available with customised firmware 1.13 or above."
end_chunked
puts ">>> Diagnostics only available with customised firmware 1.13 or above."
exit
}
chunk ">>> Beginning diagnostic $diag\r\n"
puts ">>> Beginning diagnostic $diag\r\n"
set bcmd "|/bin/diag $diag"
set fd [open $bcmd r]
while {[gets $fd line] >= 0} {
chunk "$line\r\n"
#chunk_pad
puts "$line"
}
close $fd
chunk "\r\n"
chunk ">>> Ending diagnostic $diag\r\n"
end_chunked
puts "\r\n"
puts ">>> Ending diagnostic $diag\r\n"

View File

@ -2,7 +2,7 @@
package require cgi
source /mod/webif/lib/setup
require chunked pretty_size
require pretty_size
cgi_input
#cgi_dump
@ -10,23 +10,21 @@ cgi_input
set file [cgi_get file "/tmp/hosts"]
if {$file eq "-"} { exit }
start_chunked "text/plain"
httpheader "text/plain" 0
if {![file exists $file]} {
chunk ">>> File $file does not exist.\r\n"
puts ">>> File $file does not exist.\r\n"
} else {
set type [exec /mod/bin/file --brief --mime-type --dereference $file]
if {![string match {text/*} $type]} {
chunk ">>> File $file is not a plain file ($type)"
puts ">>> File $file is not a plain file ($type)"
} elseif {[file size $file] > 102400} {
chunk ">>> File $file is too large."
chunk ">>> [pretty_size [file size $file]]"
puts ">>> File $file is too large."
puts ">>> [pretty_size [file size $file]]"
} else {
set fp [open $file r]
chunk [read $fp]
puts [read $fp]
close $fp
}
}
end_chunked

View File

@ -1,4 +0,0 @@
<!--#include virtual="/lib/header.shtml" -->
<!--#exec cmd="/mod/webif/include/epg.jim" -->
<!--#include virtual="/lib/footer.shtml" -->

View File

@ -2,9 +2,9 @@
package require cgi
source /mod/webif/lib/setup
header
require epg.class spinner.class altrow epg_search system.class
noheader
require totop
@ -112,3 +112,5 @@ puts "<font class=footnote>
epg cleanup
footer

View File

@ -0,0 +1,14 @@
<!DOCTYPE HTML>
<html>
<head>
<title>Page Redirection</title>
<meta http-equiv=refresh content="0; url=index.jim" />
<script>
window.location.href = "index.jim";
</script>
</head>
<body>
You are being redirected to <a href=index.jim>index.jim>/a>
</body>
</html>

View File

@ -1,5 +1,10 @@
<!--#include virtual="/lib/header.shtml" -->
#!/mod/bin/jimsh
source /mod/webif/lib/setup
header
puts {
<div class=toolbarouter style="top: -40px">
<div id=status class=toolbar>
<span id=status_txt>
@ -17,8 +22,11 @@ $(document).ready(function() {
});
});
</script>
}
<!--#exec cmd="/mod/webif/include/menuicons.jim" -->
source /mod/webif/include/menuicons.jim
puts {
</div>
<div class=footer>
@ -31,8 +39,13 @@ Firmware</a> |
<a target=_blank href="http://wiki.hummy.tv/wiki/Webif_release_notes">Webif</a>
</li>
</ul>
<!--#exec cmd="/mod/webif/include/modversion.jim" -->
}
source /mod/webif/include/modversion.jim
puts {
</div>
}
<!--#include virtual="/lib/footer.shtml" -->
footer

View File

@ -1 +0,0 @@
../lib/jquery.plugin/easing/easing.js

View File

@ -1 +0,0 @@
../lib/jquery.plugin/iajax/iajax.js

View File

@ -1 +0,0 @@
../lib/jquery.iphone-style-checkboxes/iphone-style-checkboxes.js

View File

@ -1 +0,0 @@
../lib/jquery.plugin/ui.totop/jquery.ui.totop.js

View File

@ -1 +0,0 @@
<!--#exec cmd="/mod/webif/html/lib/footer.jim" -->

View File

@ -1 +0,0 @@
<!--#exec cmd="/mod/webif/html/lib/header.jim" -->

View File

@ -227,7 +227,7 @@ eventfooter
puts {
<br>
<small>
<button onclick="window.location='/backup.shtml';">
<button onclick="window.location='/backup/index.jim';">
Backup/Restore Scheduled Recordings/Events
</button>
}

View File

@ -1,7 +1,10 @@
<!--#include virtual="/lib/header.shtml" -->
<link href=/lib/jquery.plugin/iphone-style-checkboxes/iphone-style-checkboxes.css rel=stylesheet type=text/css />
<script type="text/javascript" src="/lib/jquery.plugin/iphone-style-checkboxes/iphone-style-checkboxes.js"></script>
<script type="text/javascript" src="/lib/jquery.plugin/enadis/enadis.js"></script>
#!/mod/bin/jimsh
source /mod/webif/lib/setup
jqplugin iphone-style-checkboxes enadis
header
puts {
<script type="text/javascript">
$(document).ready(function() {
@ -48,6 +51,35 @@ Results...
<th>Auto Startup</th>
<th>Status</th>
</tr>
<!--#exec cmd="/mod/webif/include/services.jim" -->
}
set services [split [exec /mod/bin/service mlist]]
foreach service $services {
lassign [split $service ":"] name installed auto running
if {$name eq "mongoose"} continue
puts "<tr><td class=even>$name</td>"
if (!$installed) {
puts "<td colspan=3><i>Not installed</i></td></tr>"
continue
}
puts -nonewline "<td><input type=checkbox class=auto name=\"$name\""
if ($auto) { puts -nonewline " checked" }
puts "></td>"
puts -nonewline "<td><input type=checkbox class=toggle name=\"$name\""
if ($running) { puts -nonewline " checked" }
puts "></td>"
puts "</tr>"
}
puts {
</table>
<!--#include virtual="/lib/footer.shtml" -->
}
footer

View File

@ -1 +0,0 @@
test

View File

@ -1 +0,0 @@
test

View File

@ -44,7 +44,7 @@ foreach sa $smartattrs {
}
if {$smartmsg ne ""} {
if {![dict exists $env REQUEST_URI]} { set env(REQUEST_URI) "" }
if {![dict exists $env SCRIPT_NAME]} { set env(SCRIPT_NAME) "" }
puts "
<div id=smartwarning class=warningbox><center>
!! WARNING !!
@ -54,7 +54,7 @@ this device.
<br><br>
[string map {"\n" "<br>"} $smartmsg]
"
if {$env(REQUEST_URI) ne "/diag/disk.jim"} {
if {$env(SCRIPT_NAME) ne "/diag/disk.jim"} {
puts "
<br>
<a href=/diag/disk.jim>Go to disk diagnostics</a>

View File

@ -6,6 +6,6 @@ require settings.class
if {[[settings] epg_style] eq "grid"} {
puts -nonewline "/cgi-bin/xepg.jim"
} else {
puts -nonewline "/epg.shtml"
puts -nonewline "/epg/list.jim"
}

View File

@ -39,7 +39,7 @@ set settings [settings]
if {[$settings epg_style] eq "grid"} {
set epglink "/cgi-bin/xepg.jim"
} else {
set epglink "/epg.shtml"
set epglink "/epg/list.jim"
}
puts {<div style="clear: both">}
@ -60,7 +60,7 @@ if {[[settings] nomobile] eq "0"} {
}
menuitem "Service Management" "/img/spanner.png" \
/services.shtml 217 228
/services/index.jim 217 228
menuitem "Package Management" "/img/packages.png" \
/pkg/index.jim 217 228
menuitem "Settings" "/images/326_1_00_Menu_Settings.png" \

View File

@ -1,24 +0,0 @@
#!/mod/bin/jimsh
set services [split [exec /mod/bin/service mlist]]
foreach service $services {
lassign [split $service ":"] name installed auto running
puts "<tr><td class=even>$name</td>"
if (!$installed) {
puts "<td colspan=3><i>Not installed</i></td></tr>"
continue
}
puts -nonewline "<td><input type=checkbox class=auto name=\"$name\""
if ($auto) { puts -nonewline " checked" }
puts "></td>"
puts -nonewline "<td><input type=checkbox class=toggle name=\"$name\""
if ($running) { puts -nonewline " checked" }
puts "></td>"
puts "</tr>"
}

View File

@ -9,7 +9,7 @@ require plugin system.class
if {[[settings] epg_style] eq "grid"} {
set epglink "/cgi-bin/xepg.jim"
} else {
set epglink "/epg.shtml"
set epglink "/epg/list.jim"
}
proc tb {icon txt link {height 50} {width 0}} {
@ -41,7 +41,7 @@ if {[file exists "/mod/bin/ir"]} {
tb "/images/323_1_10_Menu_Video.png" "Browse" "/browse/index.jim"
tb "/images/321_1_00_Menu_CHList.png" "Schedule" "/sched/sched.jim"
tb "/images/328_1_26_Menu_TV_Guide.png" "EPG" $epglink
tb "/img/spanner.png" "Services" "/services.shtml"
tb "/img/spanner.png" "Services" "/services/index.jim"
tb "/img/packages.png" "Packages" "/pkg/index.jim"
tb "/images/326_1_00_Menu_Settings.png" "Settings" "/cgi-bin/settings.jim"
tb "/img/diagnostics.png" "Diag" "/diag/diag.jim"

View File

@ -60,7 +60,7 @@ puts "</td><td>"
if {[[settings] epg_style] eq "grid"} {
puts "<a href=/cgi-bin/xepg.jim>"
} else {
puts "<a href=/epg.shtml>"
puts "<a href=/epg/list.jim>"
}
puts "Now/Next</a>"