mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-02 18:31:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'check/next-cc'

Browse Source 
again: it compiles, but is not really tested...

Conflicts:
	acinclude.m4
	src/driver/volume.cpp
	src/gui/infoviewer.cpp
	src/gui/osd_setup.cpp
	src/gui/start_wizard.cpp
	src/zapit/src/getservices.cpp
This commit is contained in:
Stefan Seyfried
2013-07-06 19:01:15 +02:00
parent 3e2e647745 af662827d5
commit 7cfe54dc2f
91 changed files with 5546 additions and 562 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nhttpd/README
View File

@@ -32,7 +32,7 @@ Tuxbox.LogosURL=
WebsiteMain.directory=/share/tuxbox/neutrino/httpd // Main HTML,Javascript, Images Directoty root (e.g. read-only area in mFlash)
WebsiteMain.override_directory=/var/httpd // Override directory (writable) for extensions or Updates. Webserver first search here.
WebsiteMain.port=80 // Port the webserver is running on
WebsiteMain.hosted_directory=/var/hosted // our own directory hosted by the webserver. Adressable with <box ip>/hosted/<your files>
WebsiteMain.hosted_directory=/mnt/hosted // our own directory hosted by the webserver. Adressable with <box ip>/hosted/<your files>
configfile.version=4 // Version of this config file
mod_auth.authenticate=false // ask for username/password (http digit authentication)
mod_auth.no_auth_client= // IP Adress without http authentication

2
src/nhttpd/nhttpd.conf.in
View File

@@ -4,7 +4,7 @@ Tuxbox.LogosURL=@TARGET_ICONSDIR@/logo
WebsiteMain.directory=@TARGET_PRIVATE_HTTPDDIR@
WebsiteMain.override_directory=@TARGET_PUBLIC_HTTPDDIR@
WebsiteMain.port=80
WebsiteMain.hosted_directory=/var/hosted
WebsiteMain.hosted_directory=@TARGET_HOSTED_HTTPDDIR@
configfile.version=4
mod_auth.authenticate=false
mod_auth.no_auth_client=

37
src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp
View File

@@ -345,7 +345,7 @@ std::string CNeutrinoYParser::func_get_bouquets_with_epg(CyhookHandler *hh, std:
int i = 1;
char classname;
t_channel_id current_channel = CZapit::getInstance()->GetCurrentChannelID();
int prozent;
int prozent = 100;
CSectionsdClient::responseGetCurrentNextInfoChannelID currentNextInfo;
std::string timestr;
bool have_logos = false;
@@ -373,20 +373,31 @@ std::string CNeutrinoYParser::func_get_bouquets_with_epg(CyhookHandler *hh, std:
/* timer slider */
if(event && event->duration > 0)
{
prozent = 100 * (time(NULL) - event->startTime) / event->duration;
yresult += string_printf("<td class=\"%c\"><table border=\"0\" cellspacing=\"0\" cellpadding=\"3\"><tr><td>\n"
"\t<table border=\"0\" rules=\"none\" class=\"cslider cslider_table\">"
"<tr>"
"<td class=\"cslider cslider_used\" width=\"%d\"></td>"
"<td class=\"cslider cslider_free\" width=\"%d\"></td>"
"</tr>"
"</table>\n</td>\n"
, classname
, (prozent / 10) * 3
, (10 - (prozent / 10))*3
);
}
else
prozent = 100;
yresult += string_printf("<td class=\"%c\"><table border=\"0\" cellspacing=\"0\" cellpadding=\"3\"><tr><td>\n"
"\t<table border=\"0\" rules=\"none\" class=\"cslider_table\" width=\"32\">"
"<tr>"
"<td class=\"cslider_used\" width=\"%d\"></td>"
"<td class=\"cslider_free\" width=\"%d\"></td>"
"</tr>"
"</table>\n</td>\n"
, classname
, (prozent / 10) * 3
, (10 - (prozent / 10))*3
);
{
yresult += string_printf("<td class=\"%c\"><table border=\"0\" cellspacing=\"0\" cellpadding=\"3\"><tr><td>\n"
"\t<table border=\"0\" rules=\"none\" class=\"cslider cslider_table\">"
"<tr>"
"<td class=\"cslider cslider_noepg\"></td>"
"</tr>"
"</table>\n</td>\n"
, classname
);
}
/* channel name and buttons */
yresult += string_printf("<td>\n%s<a class=\"clist\" href=\"javascript:do_zap('"

1
src/nhttpd/web/Makefile.am
View File

@@ -65,7 +65,6 @@ install_DATA = channels.js \
Y_Settings_video_audio.yhtm \
Y_Settings_VNC.yhtm \
Y_Settings_wol.yhtm \
Y_Settings.yhtm \
Y_Settings_yWeb.yhtm \
Y_Settings_zapit.yhtm \
Y_StreamInfo.yhtm \

358
src/nhttpd/web/Y_Blocks.txt
View File

@@ -53,7 +53,7 @@ start-block~nhttpd_save_settings
{=ini-set:/var/tuxbox/config/nhttpd.conf;WebsiteMain.port;{=port=}~cache=}
{=ini-set:/var/tuxbox/config/nhttpd.conf;webserver.threading;{=threading=}~cache=}
{=ini-set:/var/tuxbox/config/nhttpd.conf;server.no_keep-alive_ips;{=no_keep_alive_ips=}~cache=}
{=ini-set:/var/tuxbox/config/nhttpd.conf;WebsiteMain.hosted_directory;{=HostedDocRoot=}~cache=}
{=ini-set:/var/tuxbox/config/nhttpd.conf;WebsiteMain.hosted_directory;{=hosted_directory=}~cache=}
{=ini-set:/var/tuxbox/config/nhttpd.conf;WebsiteMain.override_directory;{=override_directory=}~cache=}
{=ini-set:/var/tuxbox/config/nhttpd.conf;mod_sendfile.mime_types;{=mod_sendfile_mime_types=}~cache=}
{=ini-set:/var/tuxbox/config/nhttpd.conf;mod_sendfile.sendAll;{=mod_sendfile_sendAll=}~cache=}
@@ -496,19 +496,92 @@ end-block~frame_live_epg
# ------- Remote
start-block~remote
{=if-equal:CST Neo SAT~{=if-equal:{=ini-get:/var/tuxbox/config/Y-Web.conf;fb;default=}~default~{=func:get_boxtype=}~{=ini-get:/var/tuxbox/config/Y-Web.conf;fb;default=}=}~{=include-block:Y_Blocks.txt;remote_neo=}~
{=if-equal:{=func:get_boxtype=}~CST Neo CABLE~{=include-block:Y_Blocks.txt;remote_neo=}~
{=if-equal:{=func:get_boxtype=}~CST Zee SAT~{=include-block:Y_Blocks.txt;remote_zee=}~
{=if-equal:{=func:get_boxtype=}~CST Zee CABLE~{=include-block:Y_Blocks.txt;remote_zee=}~
{=if-equal:{=func:get_boxtype=}~CST Neo Twin SAT~{=include-block:Y_Blocks.txt;remote_zee=}~
{=if-equal:{=func:get_boxtype=}~CST Neo Twin CABLE~{=include-block:Y_Blocks.txt;remote_zee=}~
{=include-block:Y_Blocks.txt;remote_hd1=}=}=}=}=}=}=}
{=var-set:nfbtype={=ini-get:/var/tuxbox/config/neutrino.conf;remote_control_hardware=}=}
{=var-set:yfbtype={=ini-get:/var/tuxbox/config/Y-Web.conf;fb;0=}=}
{=var-set:boxtype={=func:get_boxtype=}=}
{=if-equal:{=var-get:yfbtype=}~0~
{=if-equal:{=var-get:nfbtype=}~2~ {=include-block:Y_Blocks.txt;rc_dbox_philips=}~
{=if-equal:{=var-get:nfbtype=}~1~ {=include-block:Y_Blocks.txt;rc_dbox_nokia_old=}~
{=if-equal:{=var-get:boxtype=}~CST Neo SAT~ {=include-block:Y_Blocks.txt;rc_cst_v2=}~
{=if-equal:{=var-get:boxtype=}~CST Neo CABLE~ {=include-block:Y_Blocks.txt;rc_cst_v2=}~
{=if-equal:{=var-get:boxtype=}~CST Zee SAT~ {=include-block:Y_Blocks.txt;rc_cst_v3=}~
{=if-equal:{=var-get:boxtype=}~CST Zee CABLE~ {=include-block:Y_Blocks.txt;rc_cst_v3=}~
{=if-equal:{=var-get:boxtype=}~CST Neo Twin SAT~ {=include-block:Y_Blocks.txt;rc_cst_v4=}~
{=if-equal:{=var-get:boxtype=}~CST Neo Twin CABLE~ {=include-block:Y_Blocks.txt;rc_cst_v4=}~
{=comment:fallback~=} {=include-block:Y_Blocks.txt;rc_cst_v1=}
=}=}=}=}=}=}
=}=}
~
{=if-equal:{=var-get:yfbtype=}~-2~ {=include-block:Y_Blocks.txt;rc_dbox_philips=}~
{=if-equal:{=var-get:yfbtype=}~-1~ {=include-block:Y_Blocks.txt;rc_dbox_nokia_old=}~
{=if-equal:{=var-get:yfbtype=}~1~ {=include-block:Y_Blocks.txt;rc_cst_v1=}~
{=if-equal:{=var-get:yfbtype=}~2~ {=include-block:Y_Blocks.txt;rc_cst_v2=}~
{=if-equal:{=var-get:yfbtype=}~3~ {=include-block:Y_Blocks.txt;rc_cst_v3=}~
{=if-equal:{=var-get:yfbtype=}~4~ {=include-block:Y_Blocks.txt;rc_cst_v4=}~
{=comment:fallback~=} {=include-block:Y_Blocks.txt;rc_cst_v1=}
=}=}=}=}=}=}
=}
end-block~remote
# ------- Remote Coolstream Neo
start-block~remote_neo
<img src="images/neo.jpg" usemap="#rc"/>
<map name="rc" id="rc">
# ------ Remote CST V1 (HD1 / BSE)
start-block~rc_cst_v1
<img src="images/rc_cst_v1.jpg" usemap="#rc" alt="remote" />
<map name="rc" id="rc">
<area shape="rect" href="javascript:rcsim('KEY_POWER')" coords="330, 38, 355, 68" />
<area shape="rect" href="javascript:rcsim('KEY_MUTE')" coords="225, 37, 252, 66" />
<area shape="rect" href="javascript:rcsim('KEY_1')" coords="220, 85, 259, 119" />
<area shape="rect" href="javascript:rcsim('KEY_2')" coords="273, 79, 313, 104" />
<area shape="rect" href="javascript:rcsim('KEY_3')" coords="330, 85, 365, 120" />
<area shape="rect" href="javascript:rcsim('KEY_4')" coords="220, 125, 259, 160" />
<area shape="rect" href="javascript:rcsim('KEY_5')" coords="273, 120, 313, 145" />
<area shape="rect" href="javascript:rcsim('KEY_6')" coords="330, 125, 365, 160" />
<area shape="rect" href="javascript:rcsim('KEY_7')" coords="220, 170, 259, 200" />
<area shape="rect" href="javascript:rcsim('KEY_8')" coords="273, 160, 313, 185" />
<area shape="rect" href="javascript:rcsim('KEY_9')" coords="330, 170, 365, 200" />
<area shape="rect" href="javascript:rcsim('KEY_0')" coords="273, 200, 313, 230" />
<area shape="rect" href="javascript:rcsim('KEY_INFO')" coords="330, 210, 365, 245" />
<area shape="rect" href="javascript:rcsim('KEY_SETUP')" coords="215, 282, 240, 310" />
<area shape="rect" href="javascript:rcsim('KEY_EPG')" coords="255, 247, 280, 275" />
<area shape="rect" href="javascript:rcsim('KEY_FAVORITES')" coords="306, 247, 330, 275" />
<area shape="rect" href="javascript:rcsim('KEY_HOME')" coords="340, 282, 365, 310" />
<area shape="rect" href="javascript:rcsim('KEY_UP')" coords="265, 280, 320, 304" />
<area shape="rect" href="javascript:rcsim('KEY_LEFT')" coords="243, 300, 262, 360" />
<area shape="rect" href="javascript:rcsim('KEY_OK')" coords="276, 316, 307, 350" />
<area shape="rect" href="javascript:rcsim('KEY_RIGHT')" coords="320, 304, 340, 365" />
<area shape="rect" href="javascript:rcsim('KEY_DOWN')" coords="264, 360, 320, 385" />
<area shape="rect" href="javascript:rcsim('KEY_VOLUMEUP')" coords="220, 367, 247, 396" />
<area shape="rect" href="javascript:rcsim('KEY_VOLUMEDOWN')" coords="257, 396, 282, 425" />
<area shape="rect" href="javascript:rcsim('KEY_PAGEUP')" coords="336, 367, 360, 396" />
<area shape="rect" href="javascript:rcsim('KEY_PAGEDOWN')" coords="300, 396, 327, 425" />
<area shape="rect" href="javascript:rcsim('KEY_TV')" coords="224, 422, 260, 455" />
<area shape="rect" href="javascript:rcsim('KEY_TEXT')" coords="274, 439, 307, 463" />
<area shape="rect" href="javascript:rcsim('KEY_RADIO')" coords="224, 422, 260, 455" />
<area shape="rect" href="javascript:rcsim('KEY_RED')" coords="225, 468, 246, 492" />
<area shape="rect" href="javascript:rcsim('KEY_GREEN')" coords="260, 480, 283, 505" />
<area shape="rect" href="javascript:rcsim('KEY_YELLOW')" coords="295, 480, 318, 505" />
<area shape="rect" href="javascript:rcsim('KEY_BLUE')" coords="333 470, 354, 492" />
<area shape="rect" href="javascript:rcsim('KEY_SAT')" coords="220, 526, 259, 548" />
<area shape="rect" href="javascript:rcsim('KEY_HELP')" coords="268, 530, 311, 550" />
<area shape="rect" href="javascript:rcsim('KEY_NEXT')" coords="320, 530, 360, 548" />
<area shape="rect" href="javascript:rcsim('KEY_PREVIOUS')" coords="319, 561, 356, 580" />
<area shape="rect" href="javascript:rcsim('KEY_TIME')" coords="223, 558, 260, 580" />
<area shape="rect" href="javascript:rcsim('KEY_AUDIO')" coords="267, 562, 311, 583" />
<area shape="rect" href="javascript:rcsim('KEY_REWIND')" coords="224, 589, 259, 612" />
<area shape="rect" href="javascript:rcsim('KEY_FORWARD')" coords="266, 592, 310, 612" />
<area shape="rect" href="javascript:rcsim('KEY_PAUSE')" coords="318, 592, 352, 612" />
<area shape="rect" href="javascript:rcsim('KEY_RECORD')" coords="224, 620, 259, 645" />
<area shape="rect" href="javascript:rcsim('KEY_STOP')" coords="265, 625, 310, 645" />
<area shape="rect" href="javascript:rcsim('KEY_PLAY')" coords="315, 625, 350, 645" />
<area shape="rect" href="javascript:rcsim('KEY_GAMES')" coords="318, 422, 360, 455" />
</map>
end-block~rc_cst_v1
# ------- Remote CST V2 (NEO)
start-block~rc_cst_v2
<img src="images/rc_cst_v2.jpg" usemap="#rc" alt="remote" />
<map name="rc" id="rc">
<area shape="rect" href="javascript:rcsim('KEY_POWER')" coords="217, 28, 240, 50" />
<area shape="rect" href="javascript:rcsim('KEY_MUTE')" coords="328, 29, 348, 50" />
<area shape="rect" href="javascript:rcsim('KEY_1')" coords="223, 161, 250, 187" />
@@ -557,112 +630,161 @@ start-block~remote_neo
<area shape="rect" href="javascript:rcsim('KEY_WWW')" coords="216, 128, 237, 150" />
<area shape="rect" href="javascript:rcsim('KEY_GAMES')" coords="290, 628, 315, 651" />
</map>
end-block~remote_neo
end-block~rc_cst_v2
# ------ Remote Coolstream ZEE
start-block~remote_zee
<img src="images/zee.jpg" usemap="#rc"/>
<map name="rc" id="rc">
<area shape="rect" href="javascript:rcsim('KEY_POWER')" coords="217, 26, 248, 57" />
<area shape="rect" href="javascript:rcsim('KEY_MUTE')" coords="306, 28, 327, 52" />
<area shape="rect" href="javascript:rcsim('KEY_1')" coords="211, 152, 243, 173" />
<area shape="rect" href="javascript:rcsim('KEY_2')" coords="255, 152, 288, 173" />
<area shape="rect" href="javascript:rcsim('KEY_3')" coords="301, 152, 333, 173" />
<area shape="rect" href="javascript:rcsim('KEY_4')" coords="211, 181, 243, 200" />
<area shape="rect" href="javascript:rcsim('KEY_5')" coords="255, 181, 288, 200" />
<area shape="rect" href="javascript:rcsim('KEY_6')" coords="301, 181, 333, 200" />
<area shape="rect" href="javascript:rcsim('KEY_7')" coords="211, 209, 243, 228" />
<area shape="rect" href="javascript:rcsim('KEY_8')" coords="255, 209, 288, 228" />
<area shape="rect" href="javascript:rcsim('KEY_9')" coords="301, 209, 333, 228" />
<area shape="rect" href="javascript:rcsim('KEY_0')" coords="255, 236, 288, 257" />
<area shape="rect" href="javascript:rcsim('KEY_INFO')" coords="310, 268, 334, 291" />
<area shape="rect" href="javascript:rcsim('KEY_SETUP')" coords="210, 368, 234, 393" />
<area shape="rect" href="javascript:rcsim('KEY_EPG')" coords="210, 267, 233, 290" />
<area shape="rect" href="javascript:rcsim('KEY_FAVORITES')" coords="301, 236, 333, 257" />
<area shape="rect" href="javascript:rcsim('KEY_HOME')" coords="312, 368, 333, 391" />
<area shape="rect" href="javascript:rcsim('KEY_UP')" coords="255, 277, 290, 299" />
<area shape="rect" href="javascript:rcsim('KEY_LEFT')" coords="219, 312, 242, 348" />
<area shape="rect" href="javascript:rcsim('KEY_OK')" coords="256, 315, 291, 345" />
<area shape="rect" href="javascript:rcsim('KEY_RIGHT')" coords="299, 310, 323, 348" />
<area shape="rect" href="javascript:rcsim('KEY_DOWN')" coords="253, 355, 293, 385" />
<area shape="rect" href="javascript:rcsim('KEY_VOLUMEUP')" coords="211, 404, 253, 426" />
<area shape="rect" href="javascript:rcsim('KEY_VOLUMEDOWN')" coords="211, 439, 253, 463" />
<area shape="rect" href="javascript:rcsim('KEY_PAGEUP')" coords="294, 404, 333, 428" />
<area shape="rect" href="javascript:rcsim('KEY_PAGEDOWN')" coords="294, 438, 333, 463" />
<area shape="rect" href="javascript:rcsim('KEY_TV')" coords="209, 80, 232, 100" />
<area shape="rect" href="javascript:rcsim('KEY_TEXT')" coords="211, 237, 242, 256" />
<area shape="rect" href="javascript:rcsim('KEY_RADIO')" coords="209, 80, 232, 100" />
<area shape="rect" href="javascript:rcsim('KEY_RED')" coords="211, 476, 231, 499" />
<area shape="rect" href="javascript:rcsim('KEY_GREEN')" coords="244, 476, 266, 499" />
<area shape="rect" href="javascript:rcsim('KEY_YELLOW')" coords="280, 476, 303, 499" />
<area shape="rect" href="javascript:rcsim('KEY_BLUE')" coords="316, 476, 338, 499" />
<area shape="rect" href="javascript:rcsim('KEY_SAT')" coords="261, 422, 285, 445" />
<area shape="rect" href="javascript:rcsim('KEY_HELP')" coords="310, 115, 333, 137" />
<area shape="rect" href="javascript:rcsim('KEY_NEXT')" coords="277, 78, 299, 100" />
<area shape="rect" href="javascript:rcsim('KEY_PREVIOUS')" coords="244, 78, 265, 100" />
<area shape="rect" href="javascript:rcsim('KEY_TIME')" coords="311, 582, 333, 604" />
<area shape="rect" href="javascript:rcsim('KEY_SLEEP')" coords="244, 114, 265, 137" />
<area shape="rect" href="javascript:rcsim('KEY_AUDIO')" coords="277, 114, 300, 137" />
<area shape="rect" href="javascript:rcsim('KEY_REWIND')" coords="216, 552, 236, 574" />
<area shape="rect" href="javascript:rcsim('KEY_FORWARD')" coords="279, 552, 300, 574" />
<area shape="rect" href="javascript:rcsim('KEY_PAUSE')" coords="248, 582, 269, 604" />
<area shape="rect" href="javascript:rcsim('KEY_RECORD')" coords="216, 582, 236, 604" />
<area shape="rect" href="javascript:rcsim('KEY_STOP')" coords="311, 552, 333, 574" />
<area shape="rect" href="javascript:rcsim('KEY_PLAY')" coords="248, 552, 269, 574" />
<area shape="rect" href="javascript:rcsim('KEY_WWW')" coords="216, 512, 236, 534" />
<area shape="rect" href="javascript:rcsim('KEY_GAMES')" coords="279, 582, 300, 604" />
</map>
end-block~remote_zee
# ------ Remote CST V3 (ZEE, NEO2)
start-block~rc_cst_v3
{=var-set:rcu=rc_cst_v3=}
<img src="images/rc_cst_v3.jpg" usemap="#rc" alt="remote" />
{=include-block:Y_Blocks.txt;map_rc_cst_v3_v4=}
end-block~rc_cst_v3
# ------ Remote Coolstream HD1
start-block~remote_hd1
<img src="images/hd1.jpg" usemap="#rc"/>
<map name="rc" id="rc">
<area shape="rect" href="javascript:rcsim('KEY_POWER')" coords="330, 38, 355, 68" />
<area shape="rect" href="javascript:rcsim('KEY_MUTE')" coords="225, 37, 252, 66" />
<area shape="rect" href="javascript:rcsim('KEY_1')" coords="220, 85, 259, 119" />
<area shape="rect" href="javascript:rcsim('KEY_2')" coords="273, 79, 313, 104" />
<area shape="rect" href="javascript:rcsim('KEY_3')" coords="330, 85, 365, 120" />
<area shape="rect" href="javascript:rcsim('KEY_4')" coords="220, 125, 259, 160" />
<area shape="rect" href="javascript:rcsim('KEY_5')" coords="273, 120, 313, 145" />
<area shape="rect" href="javascript:rcsim('KEY_6')" coords="330, 125, 365, 160" />
<area shape="rect" href="javascript:rcsim('KEY_7')" coords="220, 170, 259, 200" />
<area shape="rect" href="javascript:rcsim('KEY_8')" coords="273, 160, 313, 185" />
<area shape="rect" href="javascript:rcsim('KEY_9')" coords="330, 170, 365, 200" />
<area shape="rect" href="javascript:rcsim('KEY_0')" coords="273, 200, 313, 230" />
<area shape="rect" href="javascript:rcsim('KEY_INFO')" coords="330, 210, 365, 245" />
<area shape="rect" href="javascript:rcsim('KEY_SETUP')" coords="215, 282, 240, 310" />
<area shape="rect" href="javascript:rcsim('KEY_EPG')" coords="255, 247, 280, 275" />
<area shape="rect" href="javascript:rcsim('KEY_FAVORITES')" coords="306, 247, 330, 275" />
<area shape="rect" href="javascript:rcsim('KEY_HOME')" coords="340, 282, 365, 310" />
<area shape="rect" href="javascript:rcsim('KEY_UP')" coords="265, 280, 320, 304" />
<area shape="rect" href="javascript:rcsim('KEY_LEFT')" coords="243, 300, 262, 360" />
<area shape="rect" href="javascript:rcsim('KEY_OK')" coords="276, 316, 307, 350" />
<area shape="rect" href="javascript:rcsim('KEY_RIGHT')" coords="320, 304, 340, 365" />
<area shape="rect" href="javascript:rcsim('KEY_DOWN')" coords="264, 360, 320, 385" />
<area shape="rect" href="javascript:rcsim('KEY_VOLUMEUP')" coords="220, 367, 247, 396" />
<area shape="rect" href="javascript:rcsim('KEY_VOLUMEDOWN')" coords="257, 396, 282, 425" />
<area shape="rect" href="javascript:rcsim('KEY_PAGEUP')" coords="336, 367, 360, 396" />
<area shape="rect" href="javascript:rcsim('KEY_PAGEDOWN')" coords="300, 396, 327, 425" />
<area shape="rect" href="javascript:rcsim('KEY_TV')" coords="224, 422, 260, 455" />
<area shape="rect" href="javascript:rcsim('KEY_TEXT')" coords="274, 439, 307, 463" />
<area shape="rect" href="javascript:rcsim('KEY_RADIO')" coords="224, 422, 260, 455" />
<area shape="rect" href="javascript:rcsim('KEY_RED')" coords="225, 468, 246, 492" />
<area shape="rect" href="javascript:rcsim('KEY_GREEN')" coords="260, 480, 283, 505" />
<area shape="rect" href="javascript:rcsim('KEY_YELLOW')" coords="295, 480, 318, 505" />
<area shape="rect" href="javascript:rcsim('KEY_BLUE')" coords="333 470, 354, 492" />
<area shape="rect" href="javascript:rcsim('KEY_SAT')" coords="220, 526, 259, 548" />
<area shape="rect" href="javascript:rcsim('KEY_HELP')" coords="268, 530, 311, 550" />
<area shape="rect" href="javascript:rcsim('KEY_NEXT')" coords="320, 530, 360, 548" />
<area shape="rect" href="javascript:rcsim('KEY_PREVIOUS')" coords="319, 561, 356, 580" />
<area shape="rect" href="javascript:rcsim('KEY_TIME')" coords="223, 558, 260, 580" />
<area shape="rect" href="javascript:rcsim('KEY_AUDIO')" coords="267, 562, 311, 583" />
<area shape="rect" href="javascript:rcsim('KEY_REWIND')" coords="224, 589, 259, 612" />
<area shape="rect" href="javascript:rcsim('KEY_FORWARD')" coords="266, 592, 310, 612" />
<area shape="rect" href="javascript:rcsim('KEY_PAUSE')" coords="318, 592, 352, 612" />
<area shape="rect" href="javascript:rcsim('KEY_RECORD')" coords="224, 620, 259, 645" />
<area shape="rect" href="javascript:rcsim('KEY_STOP')" coords="265, 625, 310, 645" />
<area shape="rect" href="javascript:rcsim('KEY_PLAY')" coords="315, 625, 350, 645" />
<area shape="rect" href="javascript:rcsim('KEY_GAMES')" coords="318, 422, 360, 455" />
# ------ Remote CST V4 (NEO TWIN)
start-block~rc_cst_v4
{=var-set:rcu=rc_cst_v4=}
<img src="images/rc_cst_v4.jpg" usemap="#rc" alt="remote" />
{=include-block:Y_Blocks.txt;map_rc_cst_v3_v4=}
end-block~rc_cst_v4
# ------ Map for Remote CST V3 (ZEE, NEO2) and V4 (NEO TWIN)
start-block~map_rc_cst_v3_v4
<map name="rc" id="rc">
<area shape="circle" href="javascript:rcsim('KEY_POWER')" coords="46,42,14" alt="standby" title="{=L:rc.key_power=}" />
<area shape="circle" href="javascript:rcsim('KEY_MUTE')" coords="123,42,11" alt="mute" title="{=L:rc.key_mute=}" />
<area shape="circle" href="javascript:rcsim('KEY_MODE')" coords="36,87,11" alt="tv/radio" title="{=L:rc.key_mode=}" />
<area shape="circle" href="javascript:rcsim('KEY_NEXT')" coords="67,87,11" alt="skip-" title="{=L:rc.key_next=}" />
<area shape="circle" href="javascript:rcsim('KEY_PREVIOUS')" coords="97,87,11" alt="skip+" title="{=L:rc.key_previous=}" />
<!-- area shape="circle" coords="128,87,11" alt="stb/tv" / -->
<!-- area shape="circle" coords="36,120,11" alt="vformat" / -->
<area shape="circle" href="javascript:rcsim('KEY_SLEEP')" coords="67,120,11" alt="sleep" title="{=L:rc.key_sleep=}" />
<area shape="circle" href="javascript:rcsim('KEY_AUDIO')" coords="97,120,11" alt="audio" title="{=L:rc.key_audio=}" />
<area shape="circle" href="javascript:rcsim('KEY_HELP')" coords="128,120,11" alt="help" title="{=L:rc.key_help=}" />
<area shape="rect" href="javascript:rcsim('KEY_1')" coords="28,145,54,160" alt="1" title="{=L:rc.key_1=}" />
<area shape="rect" href="javascript:rcsim('KEY_2')" coords="69,145,95,160" alt="2" title="{=L:rc.key_2=}" />
<area shape="rect" href="javascript:rcsim('KEY_3')" coords="110,145,136,160" alt="3" title="{=L:rc.key_3=}" />
<area shape="rect" href="javascript:rcsim('KEY_4')" coords="28,171,54,186" alt="4" title="{=L:rc.key_4=}" />
<area shape="rect" href="javascript:rcsim('KEY_5')" coords="69,171,95,186" alt="5" title="{=L:rc.key_5=}" />
<area shape="rect" href="javascript:rcsim('KEY_6')" coords="110,171,136,186" alt="6" title="{=L:rc.key_6=}" />
<area shape="rect" href="javascript:rcsim('KEY_7')" coords="28,197,54,212" alt="7" title="{=L:rc.key_7=}" />
<area shape="rect" href="javascript:rcsim('KEY_8')" coords="69,197,95,212" alt="8" title="{=L:rc.key_8=}" />
<area shape="rect" href="javascript:rcsim('KEY_9')" coords="110,197,136,212" alt="9" title="{=L:rc.key_9=}" />
<area shape="rect" href="javascript:rcsim('KEY_0')" coords="69,222,95,237" alt="0" title="{=L:rc.key_0=}" />
<area shape="rect" href="javascript:rcsim('KEY_TEXT')" coords="28,222,54,237" alt="txt" title="{=L:rc.key_text=}" />
<area shape="rect" href="javascript:rcsim('KEY_FAVORITES')" coords="110,222,136,237" alt="fav" title="{=L:rc.key_favorites=}" />
<area shape="circle" href="javascript:rcsim('KEY_EPG')" coords="36,260,11" alt="epg" title="{=L:rc.key_epg=}" />
<area shape="circle" href="javascript:rcsim('KEY_INFO')" coords="128,260,11" alt="info" title="{=L:rc.key_info=}" />
<area shape="poly" href="javascript:rcsim('KEY_UP')" coords="51,267,65,280,82,275,100,280,113,267,82,255" alt="up" title="{=L:rc.key_up=}" />
<area shape="poly" href="javascript:rcsim('KEY_DOWN')" coords="51,343,65,330,82,335,100,330,113,343,82,355" alt="down" title="{=L:rc.key_down=}" />
<area shape="poly" href="javascript:rcsim('KEY_LEFT')" coords="57,287,44,274,33,305,44,336,57,323,53,305" alt="left" title="{=L:rc.key_left=}" />
<area shape="poly" href="javascript:rcsim('KEY_RIGHT')" coords="105,287,120,274,131,305,120,336,105,323,111,305" alt="right" title="{=L:rc.key_right=}" />
<area shape="circle" href="javascript:rcsim('KEY_OK')" coords="82,305,20" alt="ok" title="{=L:rc.key_ok=}" />
<area shape="circle" href="javascript:rcsim('KEY_SETUP')" coords="36,350,11" alt="menu" title="{=L:rc.key_setup=}" />
<area shape="circle" href="javascript:rcsim('KEY_HOME')" coords="128,350,11" alt="exit" title="{=L:rc.key_home=}" />
<area shape="rect" href="javascript:rcsim('KEY_VOLUMEUP')" coords="28,372,63,392" alt="vol+" title="{=L:rc.key_volumeup=}" />
<area shape="rect" href="javascript:rcsim('KEY_VOLUMEDOWN')" coords="28,404,63,424" alt="vol-" title="{=L:rc.key_volumedown=}" />
<area shape="rect" href="javascript:rcsim('KEY_PAGEUP')" coords="101,372,136,392" alt="page+" title="{=L:rc.key_pageup=}" />
<area shape="rect" href="javascript:rcsim('KEY_PAGEDOWN')" coords="101,404,136,424" alt="page-" title="{=L:rc.key_pagedown=}" />
<area shape="circle" href="javascript:rcsim('KEY_SAT')" coords="82,398,11" alt="sat" title="{=L:rc.key_sat=}" />
<area shape="circle" href="javascript:rcsim('KEY_RED')" coords="35,447,11" alt="red" title="{=L:rc.key_red=}" />
<area shape="circle" href="javascript:rcsim('KEY_GREEN')" coords="66,447,11" alt="green" title="{=L:rc.key_green=}" />
<area shape="circle" href="javascript:rcsim('KEY_YELLOW')" coords="98,447,11" alt="yellow" title="{=L:rc.key_yellow=}" />
<area shape="circle" href="javascript:rcsim('KEY_BLUE')" coords="129,447,11" alt="blue" title="{=L:rc.key_blue=}" />
<area shape="circle" href="javascript:rcsim('KEY_WWW')" coords="39,487,9" alt="w" title="{=L:rc.key_www=}" />
<!-- area shape="circle" coords="68,487,9" alt="sub" / -->
<!-- area shape="circle" coords="96,487,9" alt="recall" / -->
<!-- area shape="circle" coords="125,487,9" alt="pos" / -->
<area shape="circle" href="javascript:rcsim('KEY_REWIND')" coords="39,514,9" alt="rew" title="{=L:rc.key_rewind=}" />
<area shape="circle" href="javascript:rcsim('KEY_PLAY')" coords="68,514,9" alt="play" title="{=L:rc.key_play=}" />
<area shape="circle" href="javascript:rcsim('KEY_FORWARD')" coords="96,514,9" alt="ff" title="{=L:rc.key_forward=}" />
<area shape="circle" href="javascript:rcsim('KEY_STOP')" coords="125,514,9" alt="stop" title="{=L:rc.key_stop=}" />
<area shape="circle" href="javascript:rcsim('KEY_RECORD')" coords="39,541,9" alt="rec" title="{=L:rc.key_record=}" />
<area shape="circle" href="javascript:rcsim('KEY_PAUSE')" coords="68,541,9" alt="pause" title="{=L:rc.key_pause=}" />
<area shape="circle" href="javascript:rcsim('KEY_GAMES')" coords="96,541,9" alt="m/s" title="{=L:rc.key_games=}" />
<area shape="circle" href="javascript:rcsim('KEY_TIME')" coords="125,541,9" alt="t/s" title="{=L:rc.key_time=}" />
<area shape="circle" href="javascript:rcsim('KEY_NEXT')" coords="39,568,9" alt="picsize" title="{=L:rc.key_picsize=}" />
{=if-equal:{=var-get:rcu=}~rc_cst_v3~
<area shape="circle" href="javascript:rcsim('KEY_PREVIOUS')" coords="125,568,9" alt="picmode" title="{=L:rc.key_picmode=}" />~
{=if-equal:{=var-get:rcu=}~rc_cst_v4~
<area shape="circle" href="javascript:rcsim('KEY_PREVIOUS')" coords="68,568,9" alt="picmode" title="{=L:rc.key_picmode=}" />~
=}=}
</map>
end-block~remote_hd1
end-block~map_rc_cst_v3_v4
# ------- Remote d-Box Nokia old
start-block~rc_dbox_nokia_old
<img src="images/rc_dbox_nokia_old.jpg" usemap="#rc" alt="remote" />
<map name="rc" id="rc">
<area shape="rect" href="javascript:rcsim('KEY_SETUP')" coords="7,95,45,109" />
<area shape="circle" href="javascript:rcsim('KEY_7')" coords="60,102,10" />
<area shape="circle" href="javascript:rcsim('KEY_4')" coords="60,78,10" />
<area shape="circle" href="javascript:rcsim('KEY_9')" coords="102,92,10" />
<area shape="circle" href="javascript:rcsim('KEY_8')" coords="82,95,10" />
<area shape="circle" href="javascript:rcsim('KEY_6')" coords="102,71,10" />
<area shape="circle" href="javascript:rcsim('KEY_5')" coords="80,73,10" />
<area shape="circle" href="javascript:rcsim('KEY_3')" coords="102,49,10" />
<area shape="circle" href="javascript:rcsim('KEY_2')" coords="82,51,10" />
<area shape="circle" href="javascript:rcsim('KEY_1')" coords="60,55,10" />
<area shape="circle" href="javascript:rcsim('KEY_0')" coords="59,126,11" />
<area shape="poly" href="javascript:rcsim('KEY_LEFT')" coords="35,264,51,252,45,238,50,222,39,210,27,239" />
<area shape="poly" href="javascript:rcsim('KEY_RIGHT')" coords="97,265,87,255,91,241,85,223,98,210,108,240" />
<area shape="poly" href="javascript:rcsim('KEY_UP')" coords="83,216,95,206,69,195,41,206,53,220,69,214" />
<area shape="poly" href="javascript:rcsim('KEY_DOWN')" coords="95,271,85,255,71,262,51,256,41,268,68,283" />
<area shape="rect" href="javascript:rcsim('KEY_HOME')" coords="7,72,45,86" />
<area shape="circle" href="javascript:rcsim('KEY_MUTE')" coords="61,321,10" />
<area shape="circle" href="javascript:rcsim('KEY_OK')" coords="66,237,18" />
<area shape="circle" href="javascript:rcsim('KEY_BLUE')" coords="100,139,12" />
<area shape="circle" href="javascript:rcsim('KEY_YELLOW')" coords="60,153,11" />
<area shape="circle" href="javascript:rcsim('KEY_GREEN')" coords="37,171,12" />
<area shape="circle" href="javascript:rcsim('KEY_RED')" coords="21,196,11" />
<area shape="circle" href="javascript:rcsim('KEY_HELP')" coords="101,333,10" />
<area shape="circle" href="javascript:rcsim('KEY_VOLUMEUP')" coords="17,270,10" />
<area shape="circle" href="javascript:rcsim('KEY_VOLUMEDOWN')" coords="30,293,9" />
<area shape="rect" href="javascript:rcsim('KEY_POWER')" coords="7,49,46,64" />
</map>
end-block~rc_dbox_nokia_old
# ------- Remote d-Box Philips/Sagem
start-block~rc_dbox_philips
<img src="images/rc_dbox_philips.jpg" usemap="#rc" alt="remote" />
<map name="rc" id="rc">
<area shape="poly" href="javascript:rcsim('KEY_RIGHT')" coords="100,117,100,180,67,146,100,116" />
<area shape="poly" href="javascript:rcsim('KEY_DOWN')" coords="36,181,101,180,66,146" />
<area shape="poly" href="javascript:rcsim('KEY_UP')" coords="101,116,36,116,66,146" />
<area shape="poly" href="javascript:rcsim('KEY_LEFT')" coords="66,147,36,117,35,182" />
<area shape="circle" href="javascript:rcsim('KEY_SETUP')" coords="105,100,15" />
<area shape="circle" href="javascript:rcsim('KEY_HELP')" coords="32,100,16" />
<area shape="circle" href="javascript:rcsim('KEY_POWER')" coords="108,33,15" />
<area shape="circle" href="javascript:rcsim('KEY_MUTE')" coords="69,255,13" />
<area shape="circle" href="javascript:rcsim('KEY_VOLUMEUP')" coords="92,225,17" />
<area shape="circle" href="javascript:rcsim('KEY_VOLUMEDOWN')" coords="47,225,17" />
<area shape="circle" href="javascript:rcsim('KEY_OK')" coords="37,196,11" />
<area shape="circle" href="javascript:rcsim('KEY_HOME')" coords="103,195,11" />
<area shape="circle" href="javascript:rcsim('KEY_BLUE')" coords="108,72,11" />
<area shape="circle" href="javascript:rcsim('KEY_RED')" coords="30,72,11" />
<area shape="circle" href="javascript:rcsim('KEY_GREEN')" coords="54,57,11" />
<area shape="circle" href="javascript:rcsim('KEY_YELLOW')" coords="85,57,11" />
<area shape="circle" href="javascript:rcsim('KEY_0')" coords="69,363,12" />
<area shape="circle" href="javascript:rcsim('KEY_9')" coords="102,336,12" />
<area shape="circle" href="javascript:rcsim('KEY_8')" coords="69,337,12" />
<area shape="circle" href="javascript:rcsim('KEY_7')" coords="37,336,12" />
<area shape="circle" href="javascript:rcsim('KEY_6')" coords="102,310,12" />
<area shape="circle" href="javascript:rcsim('KEY_5')" coords="69,310,12" />
<area shape="circle" href="javascript:rcsim('KEY_4')" coords="37,310,12" />
<area shape="circle" href="javascript:rcsim('KEY_3')" coords="102,284,12" />
<area shape="circle" href="javascript:rcsim('KEY_2')" coords="69,284,12" />
<area shape="circle" href="javascript:rcsim('KEY_1')" coords="37,284,12" />
</map>
end-block~rc_dbox_philips

14
src/nhttpd/web/Y_Boxcontrol_Menue.yhtm
View File

@@ -56,17 +56,7 @@ function set_mode(_mode){
function init(){
volumen_set_audiobar(volumen_get());
set_mute_button();
var menu=ext.select_menu('boxcontrol');
menu.each(function(e){
var el=new Element('li').update(
new Element('a', {'target':'work',
'title': e.get('desc'),
'href': e.get('file')
}).update("-"+e.get('menuitem'))
);
$('secmenu_boxcontrol').insert({'bottom':el});
});
add_yExtensions('boxcontrol', 'secmenu_boxcontrol');
}
//]]>
</script>
@@ -101,6 +91,8 @@ function init(){
~=}
<li>
<a target="work" title="OSD-{=L:bc.menue.screenshot=}" href="Y_Tools_Screenshot.yhtm?osd=1&noremote=1">OSD-{=L:bc.menue.screenshot=}</a>
</li>
<li>
<a target="work" title="TV-{=L:bc.menue.screenshot=}" href="Y_Tools_Screenshot.yhtm?video=1&noremote=1">TV-{=L:bc.menue.screenshot=}</a>
</li>
</ul>

2
src/nhttpd/web/Y_Ext_Menue.yhtm
View File

@@ -1,4 +1,4 @@
{=var-set:extension={=if-file-exists:/var/tuxbox/config/extentions.txt~/var/tuxbox/config/extentions.txt~{=if-file-exists:/var/httpd/extentions.txt~/var/httpd/extentions.txt~/share/tuxbox/neutrino/httpd-y/extentions.txt=}=}=}
{=var-set:extension={=if-file-exists:/var/tuxbox/config/extentions.txt~/var/tuxbox/config/extentions.txt~{=if-file-exists:/var/httpd/extentions.txt~/var/httpd/extentions.txt~/share/tuxbox/neutrino/httpd/extentions.txt=}=}=}
{=var-set:management={=if-equal:{=func:get_request_data client_addr=}~{=ini-get:/var/tuxbox/config/Y-Web.conf;management_ip;{=func:get_request_data client_addr=}=}~1~=}{=if-equal:{=func:get_request_data client_addr=}~{=ini-get:/var/tuxbox/config/Y-Web.conf;management_ip2=}~1~=}=}
{=include-block:Y_Blocks.txt;head=}
<script type="text/javascript" src="/prototype.js"></script>

2
src/nhttpd/web/Y_Ext_Settings.yhtm
View File

@@ -23,7 +23,7 @@ function do_submit(){
<table border="0" class="y_form_table" cellspacing="0" cellpadding="0">
<tr>
<td>&nbsp;</td>
<td><textarea name="extentions" id="ext" cols="90" rows="30" title="extention list" style="background : white; font : 'Courier New',medium monospace; color : #436976;">{=if-file-exists:/var/tuxbox/config/extentions.txt~{=include:/var/tuxbox/config/extentions.txt=}~{=if-file-exists:/var/httpd/extentions.txt~{=include:/var/httpd/extentions.txt=}~{=include:/share/tuxbox/neutrino/httpd-y/extentions.txt=}=}=}</textarea></td>
<td><textarea name="extentions" id="ext" cols="90" rows="30" title="extention list" style="background : white; font : 'Courier New',medium monospace; color : #436976;">{=if-file-exists:/var/tuxbox/config/extentions.txt~{=include:/var/tuxbox/config/extentions.txt=}~{=if-file-exists:/var/httpd/extentions.txt~{=include:/var/httpd/extentions.txt=}~{=include:/share/tuxbox/neutrino/httpd/extentions.txt=}=}=}</textarea></td>
</tr>
</table>
<br/>

9
src/nhttpd/web/Y_Ext_Update.js
View File

@@ -45,7 +45,7 @@ function update_list_addRow(_body, i, your_version, ext_item)
var mycurrent_row = y_add_row_to_table(_body, ((i % 2) ==0)?"a":"b" );
var check='<input type="checkbox" name="setupdate" id="ch'+i+'" ysize="'+ext_item.get('size')+'" onchange="changeitem(ch'+i+')">';
var info="";
var info="&nbsp;";
var etype="";
switch (ext.upd_version){
@@ -56,7 +56,8 @@ function update_list_addRow(_body, i, your_version, ext_item)
var yweb_version=ext_item.get('yweb_version');
if (!yweb.require(yweb_version))
check = "";
info="<a href=\""+ext_item.get('info_url')+"\" target=\"_blank\"><img src=\"/images/info.png\"/></a>";
if (typeof(ext_item.get('info_url')) != 'undefined')
info="<a href=\""+ext_item.get('info_url')+"\" target=\"_blank\"><img src=\"/images/info.png\"/></a>";
break;
}
switch(ext_item.get('type')){
@@ -180,7 +181,9 @@ function uninstall_list_addRow(_body, i, ext_item, has_uninstall)
// var check='<input type="checkbox" name="setupdate" id="ch'+i+'" ysize="'+ext_item.get('size')+'" onchange="changeitem(ch'+i+')">';
var etype="";
var info="<a href=\""+ext_item.get('info_url')+"\" target=\"_blank\"><img src=\"/images/info.png\"/></a>";
var info="&nbsp;";
if (typeof(ext_item.get('info_url')) != 'undefined')
info="<a href=\""+ext_item.get('info_url')+"\" target=\"_blank\"><img src=\"/images/info.png\"/></a>";
var uninst="<a href=\'javascript:do_uninstall(\""+ext_item.get('tag')+"\")\' title=\"uninstall\"><img src=\"/images/cross.png\"/></a>";
if(!has_uninstall) uninst="&nbsp;";
switch(ext_item.get('type')){

11
src/nhttpd/web/Y_Info_Menue.yhtm
View File

@@ -5,16 +5,7 @@
<script type="text/javascript" src="/Y_yweb.js"></script>
<script type="text/javascript">
function init(){
var menu=ext.select_menu('info');
menu.each(function(e){
var el=new Element('li').update(
new Element('a', {'target':'work',
'title': e.get('desc'),
'href': e.get('file')
}).update("-"+e.get('menuitem'))
);
$('secmenu_info').insert({'bottom':el});
});
add_yExtensions('info', 'secmenu_info');
}
</script>
</head>

33
src/nhttpd/web/Y_Live_Menue.yhtm
View File

@@ -22,36 +22,9 @@ function epg_plus_popup() {
window.open("Y_EPG_Plus.yhtm","_blank","resizable=yes,scrollbars=yes");
}
function init(){
var menu=ext.select_menu('live');
menu.each(function(e){
var el=new Element('li').update(
new Element('a', {'target':'work',
'title': e.get('desc'),
'href': e.get('file')
}).update("-"+e.get('menuitem'))
);
$('secmenu_live').insert({'bottom':el});
});
var menu=ext.select_menu('epg');
menu.each(function(e){
var el=new Element('li').update(
new Element('a', {'target':'work',
'title': e.get('desc'),
'href': e.get('file')
}).update("-"+e.get('menuitem'))
);
$('secmenu_epg').insert({'bottom':el});
});
var menu=ext.select_menu('timer');
menu.each(function(e){
var el=new Element('li').update(
new Element('a', {'target':'work',
'title': e.get('desc'),
'href': e.get('file')
}).update("-"+e.get('menuitem'))
);
$('secmenu_timer').insert({'bottom':el});
});
add_yExtensions('live', 'secmenu_live');
add_yExtensions('epg', 'secmenu_epg');
add_yExtensions('timer', 'secmenu_timer');
}
//]]>
</script>

27
src/nhttpd/web/Y_Main.css
View File

@@ -51,7 +51,7 @@ button[ytype="timedown"]{background-image:url(/images/time_down.png);}
button[ytype="timeadd"]{background-image:url(/images/time_add.png);}
button[ytype="snapshot"]{background-image:url(/images/snapshot.png);}
button[ytype="clearshot"]{background-image:url(/images/remove.png);}
button[ytype="zoomshot"]{background-image:url(/images/fullscreen.png);}
button[ytype="switchrc"]{background-image:url(/images/fb.png);}
button[ytype="go"]{background-image:url(/images/accept.png);}
button[ytype="download"]{background-image:url(/images/wget.gif);}
button[ytype="clear"]{background-image:url(/images/remove.png);}
@@ -177,8 +177,6 @@ tr {
font-weight: normal;
padding: 0em 0.3em;
}
.y_menu_prim_item {
}
.y_menu_prim li a {
font-size: 11pt;
text-decoration: none;
@@ -191,6 +189,10 @@ tr {
.y_menu_prim li a:hover {
color: #FF6600;
}
/*extensions*/
.y_menu_prim_ext {
}
#box_name {
font-weight:normal;
font-size:10pt;
@@ -280,6 +282,10 @@ tr {
.y_menu_sec ul li:first-child {
margin-top: 5px;
}
/*extensions*/
.y_menu_sec_ext {
}
.y_menu_popup_link {
float: right;
margin-right: 15px;
@@ -771,9 +777,12 @@ a:hover.clistsmall
font-size:10pt;
padding-left: 10px;
}
.cslider_table
.cslider
{
height: 10px;
}
.cslider_table
{
border: 1px solid #6cafea;
width: 30px;
border-spacing: 0px;
@@ -783,12 +792,14 @@ a:hover.clistsmall
.cslider_used
{
background-color: #A1CCF2;
height: 10px;
}
.cslider_free
{
background-color: #EAEBFF;
height: 10px;
}
.cslider_noepg
{
background-color: #FAFAFF;
}
/*EPG*/
.epg
@@ -864,9 +875,13 @@ a.timer {
#screenshot_header {
height: 30px;
}
td#remote,
td.shot {
vertical-align: top;
}
td#remote img {
margin: 10px 10px 10px 0;
}
img#shot {
width: 100%;
background-color: #ffffff;

11
src/nhttpd/web/Y_Menue.yhtm
View File

@@ -46,16 +46,7 @@ function i_start(){
g_i_counter = 0;
i_clock();
g_i_active = window.setInterval('i_interval()', 1000);
var mainmenu=ext.select_menu('main');
mainmenu.each(function(e){
var el=new Element('li').update(
new Element('a', {'class':'y_menu_prim_item', 'target':'base',
'title': e.get('desc'),
'href': e.get('file')
}).update(e.get('menuitem'))
);
$('menu_prim').insert({'bottom':el});
});
add_yExtensions('main', 'menu_prim');
}
function i_stop(){
window.clearInterval(g_i_active);

17
src/nhttpd/web/Y_Settings.yhtm
View File

@@ -1,17 +0,0 @@
{=var-set:cancache=yPyes=}
<html>
<head>
<meta HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
</head>
<frameset cols="157,*" framespacing="0" border="0" frameborder="0">
<frame name="Links" scrolling="no" noresize target="Rechts oben" src="Y_Settings_Menue.yhtm">
<frame name="Rechts_oben" src="Y_blank.htm" scrolling="auto">
<noframes>
<body topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0" marginwidth="0" marginheight="0">
<p>Diese Seite verwendet Frames. Frames werden von Ihrem Browser aber nicht unterst&uuml;zt.</p>
</body>
</noframes>
</frameset>
</html>

33
src/nhttpd/web/Y_Settings_Menue.yhtm
View File

@@ -5,36 +5,9 @@
<script type="text/javascript" src="/Y_yweb.js"></script>
<script type="text/javascript">
function init(){
var menu=ext.select_menu('settings_general');
menu.each(function(e){
var el=new Element('li').update(
new Element('a', {'target':'work',
'title': e.get('desc'),
'href': e.get('file')
}).update("-"+e.get('menuitem'))
);
$('secmenu_general').insert({'bottom':el});
});
var menu=ext.select_menu('settings_neutrino');
menu.each(function(e){
var el=new Element('li').update(
new Element('a', {'target':'work',
'title': e.get('desc'),
'href': e.get('file')
}).update("-"+e.get('menuitem'))
);
$('secmenu_neutrino').insert({'bottom':el});
});
var menu=ext.select_menu('settings_plugins');
menu.each(function(e){
var el=new Element('li').update(
new Element('a', {'target':'work',
'title': e.get('desc'),
'href': e.get('file')
}).update("-"+e.get('menuitem'))
);
$('secmenu_plugins').insert({'bottom':el});
});
add_yExtensions('settings_general', 'secmenu_general');
add_yExtensions('settings_neutrino', 'secmenu_neutrino');
add_yExtensions('settings_plugins', 'secmenu_plugins');
}
</script>
</head>

13
src/nhttpd/web/Y_Settings_nhttpd.yhtm
View File

@@ -62,7 +62,7 @@ function do_submit()
</tr>
<tr>
<td>{=L:set.nhttpd.port=}</td>
<td><input type="text" name="port" size="20" value="{=ini-get:/var/tuxbox/config/nhttpd.conf;WebsiteMain.port;80~cache=}" title="{=L:port=}"/>&nbsp;{=L:active_after_boot=}
<td><input type="text" name="port" size="20" value="{=ini-get:/var/tuxbox/config/nhttpd.conf;WebsiteMain.port;80~cache=}" title="{=L:set.nhttpd.port=}"/>&nbsp;{=L:set.nhttpd.active_after_boot=}
</td>
</tr>
{=if-not-equal:{=global-var-get:boxtype=}~coolstream~
@@ -76,8 +76,15 @@ function do_submit()
=}
<tr>
<td>{=L:set.nhttpd.alternate_web_folder=}</td>
<td><input type="text" name="override_directory" size="20" value="{=ini-get:/var/tuxbox/config/nhttpd.conf;WebsiteMain.override_directory~cache=}" title="{=L:alternate_web_folder=}"/>&nbsp;{=L:active_after_boot=}
<input type="hidden" name="HostedDocRoot" size="60" value="{=ini-get:/var/tuxbox/config/nhttpd.conf;WebsiteMain.hosted_directory~cache=}" title="Root of hosted Web. Enter mount directory."/></td>
<td>
<input type="text" name="override_directory" size="20" value="{=ini-get:/var/tuxbox/config/nhttpd.conf;WebsiteMain.override_directory~cache=}" title="{=L:set.nhttpd.alternate_web_folder=}"/>&nbsp;{=L:set.nhttpd.active_after_boot=}
</td>
</tr>
<tr>
<td>{=L:set.nhttpd.hosted_folder=}</td>
<td>
<input type="text" name="hosted_directory" size="20" value="{=ini-get:/var/tuxbox/config/nhttpd.conf;WebsiteMain.hosted_directory~cache=}" title="Root of hosted Web. Enter mount directory."/>&nbsp;{=L:set.nhttpd.active_after_boot=}
</td>
</tr>
<tr>
<td>{=L:set.nhttpd.allowed_file_extensions=}</td>

33
src/nhttpd/web/Y_Settings_yWeb.yhtm
View File

@@ -9,12 +9,20 @@ function do_submit(){
document.f.submit();
}
function do_init(){
val = "{=ini-get:/var/tuxbox/config/Y-Web.conf;fb;{=if-equal:{=global-var-get:boxtype=}~coolstream~Coolstream~default=}~open=}";
val = "{=ini-get:/var/tuxbox/config/Y-Web.conf;fb;0~open=}";
var sel=2;
switch(val){
case "default": sel=0; break;
case "Nokia": sel=1; break;
case "CST": sel=3; break;
case "-2": // d-box philips
case "-1": // d-box nokia old
case "0": // auto
case "1": // cst hd1/bse
case "2": // cst neo
case "3": // cst zee/neo2
case "4": // cst neo twin (todo!)
sel=(sel*1+val*1);
break;
default:
break;
}
document.f.fb.selectedIndex = sel;
val = "{=ini-get:/var/tuxbox/config/Y-Web.conf;start_page;bouquets~cache=}";
@@ -78,12 +86,17 @@ function do_init(){
<tr><td class="y_form_header" colspan="4">{=L:others=}</td></tr>
<tr>
<td>{=L:set.yweb.remote=}</td>
<td colspan="3"> <select name="fb" title="{=L:remote=}">
<option value="default" selected="selected">default</option>
<option value="Nokia">Nokia</option>
<option value="Sagem">Sagem/Philips</option>
<option value="CST">CST</option>
</select></td>
<td colspan="3">
<select name="fb" title="{=L:remote=}">
<option value="-2">d-Box | Philips</option>
<option value="-1">d-Box | Nokia (alt)</option>
<option value="0" selected="selected">{=L:automatic=}</option>
<option value="1">CST HD-1 | BSE</option>
<option value="2">CST HD-1plus | Neo</option>
<option value="3">CST HD-1plus | Zee/Neo2</option>
<option value="4">CST HD-1plus | Neo Twin</option>
</select>
</td>
</tr>
<tr>
<td>{=L:set.yweb.start_page=}</td>

33
src/nhttpd/web/Y_Tools_Menue.yhtm
View File

@@ -7,36 +7,9 @@ function cmd_popup(){
window.open('Y_Tools_Cmd.yhtm','cmd','width=720,height=470,resizable=yes');
}
function init(){
var menu=ext.select_menu('tools');
menu.each(function(e){
var el=new Element('li').update(
new Element('a', {'target':'work',
'title': e.get('desc'),
'href': e.get('file')
}).update("-"+e.get('menuitem'))
);
$('secmenu_tools').insert({'bottom':el});
});
var menu=ext.select_menu('expert');
menu.each(function(e){
var el=new Element('li').update(
new Element('a', {'target':'work',
'title': e.get('desc'),
'href': e.get('file')
}).update("-"+e.get('menuitem'))
);
$('secmenu_expert').insert({'bottom':el});
});
var menu=ext.select_menu('yweb');
menu.each(function(e){
var el=new Element('li').update(
new Element('a', {'target':'work',
'title': e.get('desc'),
'href': e.get('file')
}).update("-"+e.get('menuitem'))
);
$('secmenu_yweb').insert({'bottom':el});
});
add_yExtensions('tools', 'secmenu_tools');
add_yExtensions('expert', 'secmenu_expert');
add_yExtensions('yweb', 'secmenu_yweb');
}
</script>
</head>

18
src/nhttpd/web/Y_Tools_Screenshot.yhtm
View File

@@ -65,17 +65,25 @@ function do_clearshot(){
loadSyncURL("/control/exec?Y_Tools&screenshot_clear");
}
function do_zoomshot(){
// not a really zoom-function
function do_switchrc(){
if (id('remote').style.display == 'none')
$('remote').show();
else
$('remote').hide();
do_switchrc_txt();
}
function do_switchrc_txt(){
if (id('remote').style.display == 'none')
$('switchrc').update("{=L:bc.control.remote=} {=L:show=}");
else
$('switchrc').update("{=L:bc.control.remote=} {=L:hide=}");
}
//]]>
</script>
</head>
<body onload="do_snapshot();">
<body onload="do_switchrc_txt(); do_snapshot();">
<div class="work_box" id="work_box">
<div class="work_box_head"><div class="work_box_head_h2">
{=var-set:help_url==}{=var-set:menu={=L:bc.menue.screenshot=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
@@ -85,7 +93,7 @@ function do_zoomshot(){
<div class="left">
<button name="snapshot" ytype="snapshot" onclick="do_snapshot()">{=L:bc.screenshot.create=}</button>&nbsp;
<button name="clearshot" ytype="clearshot" onclick="do_clearshot()">{=L:bc.screenshot.delete=}</button>&nbsp;
<button name="zoomshot" ytype="zoomshot" onclick="do_zoomshot()">{=L:bc.screenshot.zoom=}</button>&nbsp;
<button name="switchrc" ytype="switchrc" onclick="do_switchrc()" id="switchrc">{=L:bc.control.remote=}</button>&nbsp;
</div>
<div class="right">
<form onsubmit="do_snapshot(); return false">
@@ -108,7 +116,7 @@ function do_zoomshot(){
{=include-block:Y_Blocks.txt;remote=}
</td>
<td class="shot">
<img id="shot" src="" onclick="do_zoomshot()" style="display: none" />
<img id="shot" src="" onclick="do_switchrc()" style="display: none" />
</td>
</tr>
</table>

4
src/nhttpd/web/Y_Version.txt
View File

@@ -1,4 +1,4 @@
version=2.8.0.33
date=06.02.2013
version=2.8.0.39
date=05.07.2013
type=Release
info=Port CST

16
src/nhttpd/web/Y_yweb.js
View File

@@ -182,6 +182,22 @@ Object.extend(Y.extension.prototype, {
},this);
}
});
function add_yExtensions(_ymenu, _id) {
var menu=ext.select_menu(_ymenu);
menu.each(function(e){
var el=new Element('li').update(
new Element('a', {
'class': (_ymenu == 'main') ? 'y_menu_prim_ext' : 'y_menu_sec_ext',
'target': (_ymenu == 'main') ? 'base' : 'work',
'title': e.get('desc'),
'href': e.get('file')
}).update(e.get('menuitem'))
);
$(_id).insert({'bottom':el});
});
}
/* singleton pattern*/
if (window == top.top_main.prim_menu) {
var ext = new Y.extension();

4
src/nhttpd/web/images/LICENSE
View File

@@ -1,7 +1,7 @@
Same pictures used are form the Tuxbox Community:
Published under GPL v2
- rc.jpg : Jonny Spitzner <jonnyspitzner@gmx.de>
- rc_sagem.jpg Jonny Spitzner <jonnyspitzner@gmx.de>
- rc_dbox_nokia_old.jpg : Jonny Spitzner <jonnyspitzner@gmx.de>
- rc_dbox_philips.jpg : Jonny Spitzner <jonnyspitzner@gmx.de>
- tux.gif : from wiki.tuxbox.org
From Johannes Golombek yjogol@online.de:

14
src/nhttpd/web/images/Makefile.am
View File

@@ -38,7 +38,6 @@ install_DATA = accept.png \
ftype_folder.gif \
ftype_link.gif \
fullscreen.png \
hd1.jpg \
help.gif \
help_white.gif \
hidden.gif \
@@ -56,7 +55,6 @@ install_DATA = accept.png \
lock.gif \
lock.png \
modify.png \
neo.jpg \
new.gif \
new.png \
ok.gif \
@@ -66,9 +64,12 @@ install_DATA = accept.png \
properties.gif \
properties.png \
radio.png \
rc.gif \
rc.jpg \
rc_sagem.jpg \
rc_cst_v1.jpg \
rc_cst_v2.jpg \
rc_cst_v3.jpg \
rc_cst_v4.jpg \
rc_dbox_nokia_old.jpg \
rc_dbox_philips.jpg \
record.gif \
record.png \
reload.gif \
@@ -105,5 +106,4 @@ install_DATA = accept.png \
x_red.gif \
yjogol.gif \
y.png \
zap.png \
zee.jpg
zap.png

BIN
src/nhttpd/web/images/fb.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 457 B

After

Width:  |  Height:  |  Size: 521 B

BIN
src/nhttpd/web/images/rc.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 20 KiB

0
src/nhttpd/web/images/hd1.jpg → src/nhttpd/web/images/rc_cst_v1.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 101 KiB

After

Width:  |  Height:  |  Size: 101 KiB

0
src/nhttpd/web/images/neo.jpg → src/nhttpd/web/images/rc_cst_v2.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 84 KiB

After

Width:  |  Height:  |  Size: 84 KiB

BIN
src/nhttpd/web/images/rc_cst_v3.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 76 KiB

BIN
src/nhttpd/web/images/rc_cst_v4.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 77 KiB

0
src/nhttpd/web/images/rc.jpg → src/nhttpd/web/images/rc_dbox_nokia_old.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.6 KiB

After

Width:  |  Height:  |  Size: 9.6 KiB

0
src/nhttpd/web/images/rc_sagem.jpg → src/nhttpd/web/images/rc_dbox_philips.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

BIN
src/nhttpd/web/images/rcd.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 37 KiB

BIN
src/nhttpd/web/images/zee.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 95 KiB

55
src/nhttpd/web/languages/Deutsch
View File

@@ -53,6 +53,9 @@ attention=Achtung!
directory=Verzeichnis
filename=Dateiname
restriced_by_management_ip=Zugriff verwehrt wg. ManagementIP
automatic=automatisch
show=zeigen
hide=verstecken
# ==========Main Menue
main.boxcontrol=Boxsteuerung
@@ -300,6 +303,7 @@ set.nhttpd.active_after_boot=Nach Neustart aktiv
set.nhttpd.port=Port
set.nhttpd.threading=Threading
set.nhttpd.alternate_web_folder=Alternativer Web-Ordner
set.nhttpd.hosted_folder=Eingebundenes Verzeichnis
set.nhttpd.allowed_file_extensions=Erlaubte Dateiendungen / MIME
set.nhttpd.allow_all_file_extensions=Alle Dateiendungen erlauben
set.nhttpd.url_of_logos_desc=URL bzw. Verzeichnis der Logos eingeben
@@ -534,3 +538,54 @@ info.About=Über
info.check_for_updates=Auf Updates prüfen
info.your_version=Deine Version
info.actual_version=Aktuelle Version
=========Remote control
rc.key_power=Standby - Schaltet den Receiver ein bzw. aus
rc.key_mute=Mute - Schaltet den Ton an bzw. aus
rc.key_1=1
rc.key_2=2
rc.key_3=3
rc.key_4=4
rc.key_5=5
rc.key_6=6
rc.key_7=7
rc.key_8=8
rc.key_9=9
rc.key_0=0
rc.key_text=Text - Zeigt den Teletext an
rc.key_favorites=Favoriten - Zeigt die Favoritenliste an
rc.key_volumeup=Vol+ - Erhöht die Lautstärke
rc.key_volumedown=Vol- - Verringert die Lautstärke
rc.key_pageup=Page+ - Blättert im Menü eine Seite hoch
rc.key_pagedown=Page- - Blättert im Menü eine Seiter runter
rc.key_mode=TV/Radio - Wechselt zwischen TV- und Radio-Modus
rc.key_next=Skip- - Ändert das 4:3 Anzeigeverhalten
rc.key_previous=Skip+ - Ändert das Bildschirmformat
rc.key_sleep=Sleep - Setzt einen Ausschalt-Timer
rc.key_audio=Audio - Startet den Audioplayer bzw. Internetradio
rc.key_help=Help - Startet je nach Modus verschiedene Funktionen
rc.key_red=Rot - Öffnet das Menü 'EPG/Vorschau'
rc.key_green=Grün - Offnet das Menü 'Ton-Optionen'
rc.key_yellow=Gelb - Öffnet das Menü 'Bild-Optionen' (wenn verfügbar)
rc.key_blue=Blau - Öffnet das Menü 'Erweiterungen'
rc.key_epg=EPG - Zeigt EPG-Informationen an
rc.key_info=Info - Zeigt die Infobar und EPG-Beschreibung an
rc.key_ok=OK - Bestätigt Auswahl im Menüfenster
rc.key_up=Hoch - Programmwechsel und Menünavigation
rc.key_down=Runter - Programmwechsel und Menünavigation
rc.key_left=Links - Programmwechsel und Menünavigation
rc.key_right=Rechts - Programmwechsel und Menünavigation
rc.key_setup=Menü - Öffnet bzw. schließt das Hauptmenü
rc.key_home=Exit - Schließt das geöffnete Menüfenster
rc.key_sat=Sat - Öffnet Satelliten- bzw. Anbieterübersicht
rc.key_www=
rc.key_rewind=Rewind - Zurückspulen
rc.key_play=Play - Öffnet das Filmarchiv oder startet die Wiedergabe
rc.key_forward=Forward - Vorspulen
rc.key_stop=Stop - Beendet Aufnahme, Timeshift oder Wiedergabe
rc.key_record=Record - Startet Aufnahme
rc.key_pause=Pause - Aktiviert timeshift oder pausiert die Wiedergabe
rc.key_games=
rc.key_time=
rc.key_picsize=Pic Size - Ändert das 4:3 Anzeigeverhalten
rc.key_picmode=Pic Mode - Ändert das Bildschirmformat

54
src/nhttpd/web/languages/English
View File

@@ -53,6 +53,9 @@ attention=Attention!
directory=Directory
filename=Filename
restriced_by_management_ip=restricted by ManagementIP
automatic=automatically
show=show
hide=hide
#========= MAIN Menue
main.live_tv_desc=LiveTV
@@ -303,6 +306,7 @@ set.nhttpd.active_after_boot=active after boot
set.nhttpd.port=Port
set.nhttpd.threading=Threading
set.nhttpd.alternate_web_folder=Alternate Web-Folder
set.nhttpd.hosted_folder=Mounted directory
set.nhttpd.allowed_file_extensions=Allowed File Extensions / MIME
set.nhttpd.allow_all_file_extensions=Allow all File Extensions
set.nhttpd.url_of_logos_desc=Enter URL or directory of Logos
@@ -538,3 +542,53 @@ info.check_for_updates=Check for Updates
info.your_version=Your Version
info.actual_version=Actual Version
=========Remote control
rc.key_power=Standby
rc.key_mute=Mute
rc.key_1=1
rc.key_2=2
rc.key_3=3
rc.key_4=4
rc.key_5=5
rc.key_6=6
rc.key_7=7
rc.key_8=8
rc.key_9=9
rc.key_0=0
rc.key_text=Text
rc.key_favorites=Favorites
rc.key_volumeup=Vol+
rc.key_volumedown=Vol-
rc.key_pageup=Page+
rc.key_pagedown=Page-
rc.key_mode=TV/Radio
rc.key_next=Skip-
rc.key_previous=Skip+
rc.key_sleep=Sleep
rc.key_audio=Audio
rc.key_help=Help
rc.key_red=Red
rc.key_green=Green
rc.key_yellow=Yellow
rc.key_blue=Blue
rc.key_epg=EPG
rc.key_info=Info
rc.key_ok=OK
rc.key_up=Up
rc.key_down=Down
rc.key_left=Left
rc.key_right=Right
rc.key_setup=Menu
rc.key_home=Exit
rc.key_sat=Sat
rc.key_www=
rc.key_rewind=Rewind
rc.key_play=Play
rc.key_forward=Forward
rc.key_stop=Stop
rc.key_record=Record
rc.key_pause=Pause
rc.key_games=
rc.key_time=
rc.key_picsize=Pic Size
rc.key_picmode=Pic Mode

3
src/nhttpd/yconfig.h
View File

@@ -109,7 +109,8 @@
#define YWEB_CONFIGFILE HTTPD_CONFIGDIR"/Y-Web.conf"
#define PUBLICDOCUMENTROOT PUBLIC_HTTPDDIR
#define NEUTRINO_CONFIGFILE CONFIGDIR"/neutrino.conf"
#define HOSTEDDOCUMENTROOT "/mnt/hosted"
#define HOSTEDDOCUMENTROOT HOSTED_HTTPDDIR
#define HOSTEDDOCUMENTURL "/hosted/"
#define EXTRASDOCUMENTROOT "/mnt/hosted/extras"
#define EXTRASDOCUMENTURL "/hosted/extras"
#define ZAPITXMLPATH CONFIGDIR"/zapit"

18
src/nhttpd/yhttpd.cpp
View File

@@ -507,7 +507,7 @@ void Cyhttpd::ReadConfig(void) {
Config->setString("Language.selected", HTTPD_DEFAULT_LANGUAGE);
Config->setString("Language.directory", HTTPD_LANGUAGEDIR);
if (Config->getString("WebsiteMain.hosted_directory", "") == "")
Config->setString("WebsiteMain.hosted_directory", "/var/hosted");
Config->setString("WebsiteMain.hosted_directory", HOSTEDDOCUMENTROOT);
Config->saveConfig(HTTPD_CONFIGFILE);
}
}
@@ -544,14 +544,20 @@ void Cyhttpd::ReadConfig(void) {
// Check location of logos
if (Config->getString("Tuxbox.LogosURL", "") == "") {
if (access(std::string(ConfigList["WebsiteMain.directory"] + "/logos").c_str(), 4) == 0) {
Config->setString("Tuxbox.LogosURL", ConfigList["WebsiteMain.directory"] + "/logos");
have_config = false; //save config
}
else if (access(std::string(ConfigList["WebsiteMain.override_directory"] ).c_str(), 4) == 0){
if (access(std::string(ConfigList["WebsiteMain.override_directory"] + "/logos").c_str(), 4) == 0) {
Config->setString("Tuxbox.LogosURL", ConfigList["WebsiteMain.override_directory"] + "/logos");
have_config = false; //save config
}
else if (access(std::string(ConfigList["WebsiteMain.directory"] + "/logos").c_str(), 4) == 0){
Config->setString("Tuxbox.LogosURL", ConfigList["WebsiteMain.directory"] + "/logos");
have_config = false; //save config
}
#ifdef Y_CONFIG_USE_HOSTEDWEB
else if (access(std::string(ConfigList["WebsiteMain.hosted_directory"] + "/logos").c_str(), 4) == 0){
Config->setString("Tuxbox.LogosURL", ConfigList["WebsiteMain.hosted_directory"] + "/logos");
have_config = false; //save config
}
#endif //Y_CONFIG_USE_HOSTEDWEB
}
ConfigList["Tuxbox.LogosURL"] = Config->getString("Tuxbox.LogosURL", "");

8
src/nhttpd/yhttpd_core/yresponse.cpp
View File

@@ -64,14 +64,6 @@ bool CWebserverResponse::SendResponse() {
// Checking and Preperation: Auth, static, cache, ...
//--------------------------------------------------------------
// move to mod_sendfile ???
#ifdef Y_CONFIG_USE_HOSTEDWEB
// for hosted webs: rewrite URL
std::string _hosted="/hosted/";
if((Connection->Request.UrlData["path"]).compare(0,_hosted.length(),"/hosted/") == 0) // hosted Web ?
Connection->Request.UrlData["path"]=Cyhttpd::ConfigList["WebsiteMain.hosted_directory"]
+(Connection->Request.UrlData["path"]).substr(_hosted.length()-1);
#endif //Y_CONFIG_USE_HOSTEDWEB
do {
if (Connection->RequestCanceled)
return false;

8
src/nhttpd/yhttpd_mods/mod_sendfile.cpp
View File

@@ -65,6 +65,14 @@ THandleStatus CmodSendfile::Hook_PrepareResponse(CyhookHandler *hh) {
hh->status = HANDLED_NONE;
log_level_printf(4, "mod_sendfile prepare hook start url:%s\n", hh->UrlData["fullurl"].c_str());
#ifdef Y_CONFIG_USE_HOSTEDWEB
// for hosted webs: rewrite URL
std::string _hosted=HOSTEDDOCUMENTURL;
if((hh->UrlData["path"]).compare(0,_hosted.length(),HOSTEDDOCUMENTURL) == 0) // hosted Web ?
hh->UrlData["path"]=hh->WebserverConfigList["WebsiteMain.hosted_directory"]+(hh->UrlData["path"]).substr(_hosted.length()-1);
#endif //Y_CONFIG_USE_HOSTEDWEB
std::string mime = sendfileTypes[hh->UrlData["fileext"]];
if (((mime != "") || (hh->WebserverConfigList["mod_sendfile.sendAll"] == "true"))
&& !(hh->UrlData["fileext"] == "yhtm" || hh->UrlData["fileext"] == "yjs" || hh->UrlData["fileext"] == "ysh")) {

22
src/nhttpd/yhttpd_mods/mod_yparser.cpp
View File

@@ -271,10 +271,18 @@ std::string CyParser::cgi_file_parsing(CyhookHandler *hh,
bool found = false;
std::string htmlfullfilename, yresult, html_template;
bool isHosted = false;
#ifdef Y_CONFIG_USE_HOSTEDWEB
// for hosted webs: search in hosted_directory only
std::string _hosted=hh->WebserverConfigList["WebsiteMain.hosted_directory"];
if((hh->UrlData["path"]).compare(0,_hosted.length(),hh->WebserverConfigList["WebsiteMain.hosted_directory"]) == 0) // hosted Web ?
isHosted = true;
#endif //Y_CONFIG_USE_HOSTEDWEB
char cwd[255];
getcwd(cwd, 254);
for (unsigned int i = 0; i < HTML_DIR_COUNT && !found; i++) {
htmlfullfilename = HTML_DIRS[i] + "/" + htmlfilename;
for (unsigned int i = 0; i < (isHosted ? 1 : HTML_DIR_COUNT) && !found; i++) {
htmlfullfilename = (isHosted ? "" : HTML_DIRS[i]) + "/" + htmlfilename;
std::fstream fin(htmlfullfilename.c_str(), std::fstream::in);
if (fin.good()) {
found = true;
@@ -292,11 +300,11 @@ std::string CyParser::cgi_file_parsing(CyhookHandler *hh,
}
chdir(cwd);
if (!found) {
printf("[CyParser] Y-cgi:template %s not found in\n",
htmlfilename.c_str());
for (unsigned int i = 0; i < HTML_DIR_COUNT; i++) {
printf("%s\n", HTML_DIRS[i].c_str());
}
printf("[CyParser] Y-cgi:template %s not found %s\n", htmlfilename.c_str(), isHosted ? "" : "in");
if (!isHosted)
for (unsigned int i = 0; i < HTML_DIR_COUNT; i++) {
printf("%s\n", HTML_DIRS[i].c_str());
}
}
return yresult;
}