Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Conflicts:
	src/gui/osd_setup.cpp


Origin commit data
------------------
Commit: 9e6dc9fbce
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)
This commit is contained in:
vanhofen
2017-09-12 22:32:07 +02:00
41 changed files with 802 additions and 734 deletions

View File

@@ -30,6 +30,7 @@ install_DATA = \
nagra_green.png \
nagra_white.png \
nagra_yellow.png \
ncam_green.png \
nds_green.png \
nds_white.png \
nds_yellow.png \

Binary file not shown.

After

Width:  |  Height:  |  Size: 489 B

View File

@@ -252,6 +252,8 @@ camd_item_gbox_hint GBox - Softcam und Emulator
camd_item_gbox_name gbox
camd_item_mgcamd_hint MGCamd - Emulator
camd_item_mgcamd_name mgcamd
camd_item_ncam_hint NCam - Softcam und Emulator
camd_item_ncam_name ncam
camd_item_newcs_hint NewCS - Softcam
camd_item_newcs_name newcs
camd_item_oscam_hint OSCam - Softcam
@@ -385,9 +387,35 @@ cpu.freq_default Standard Frequenz
cpu.freq_normal Normale Frequenz
cpu.freq_standby Standby Frequenz
crossteam.hint_settings_teams Einstellungen sichern und wiederherstellen,\ndie zu teilnehmenden Team-Images kompatibel sind.
crossteam.hint_settings_teams_backup Teamübergreifende Einstellungen sichern
crossteam.hint_settings_teams_help Hilfe zu teamübergreifenden Einstellungen
crossteam.hint_settings_teams_restore Teamübergreifende Einstellungen wiederherstellen
crossteam.hint_settings_teams_backup Team-übergreifende Einstellungen sichern
crossteam.hint_settings_teams_help Hilfe zu den Team-übergreifenden Einstellungen
crossteam.hint_settings_teams_restore Team-übergreifende Einstellungen wiederherstellen
daemon_control Daemon-Steuerung
daemon_item.crond_desc cron Daemon kann zeitgesteuerte Aufgaben ausführen
daemon_item.crond_name crond
daemon_item.djmount_desc UPnP AV Client kann den Inhalt von Media-Servern mounten
daemon_item.djmount_name djmount
daemon_item.dropbear_desc SSH2 Server und Client
daemon_item.dropbear_name Dropbear
daemon_item.emmremind_desc Zeigt eine Änderung der EMM's in den Infoicons an
daemon_item.emmremind_name EMM-Änderungsbenachrichtigung
daemon_item.fcm_desc Zeigt die Anrufliste der FRITZ!Box und noch vieles mehr ...
daemon_item.fcm_name FritzCallMonitor
daemon_item.inadyn_desc DynDNS Client
daemon_item.inadyn_name Inadyn
daemon_item.nfsserver_desc NFS Kernel Server
daemon_item.nfsserver_name NFS-Server
daemon_item.sambaserver_desc Server-Message-Block-Protokoll (SMB) Implementierung
daemon_item.sambaserver_name Samba-Server
daemon_item.tuxcald_desc Kalenderplugin Dienstprogramm
daemon_item.tuxcald_name TuxCal
daemon_item.tuxmaild_desc Mailplugin (IMAP/SMTP) Dienstprogramm
daemon_item.tuxmaild_name TuxMail
daemon_item.ushare_desc A/V und DLNA Medienserver
daemon_item.ushare_name uShare
daemon_item.xupnpd_desc eXtensible UPnP agent - DLNA Medienserver für IPTV
daemon_item.xupnpd_name xupnpd
>>>>>>>
date.Apr Apr
date.Aug Aug
date.Dec Dez
@@ -908,7 +936,7 @@ infoicons_flag_name4 Benutzerdefiniert
infoicons_flag_name5 Benutzerdefiniert
infoicons_flag_name6 Benutzerdefiniert
infoicons_flag_name7 Benutzerdefiniert
infoicons_head Infoicons Einstellungen
infoicons_head Infoicons
infoicons_infoviewer mit Infoviewer
infoicons_modeicon Infoicons
infoicons_msg_start Infoicons werden gestartet
@@ -1135,7 +1163,7 @@ menu.hint_blank_screen Schaltet den VideoDecoder bis zum nächsten Event (Tasten
menu.hint_buildinfo Informationen über Compiler, Compilerflags, Kernel
menu.hint_ca_init Konfiguration der CA-Systemhardware, CA-Modul und Kartenschächte
menu.hint_cache_txt Startet das Zwischenspeichern des Teletextes nach einem Kanalwechsel
menu.hint_camd Softcam und Emulator Einstellungen\nStart, Stop, Versionsinfo
menu.hint_camd_control Softcams und Emulatoren\nStart, Stop, Versionsinfo
menu.hint_camd_reset Aktive Softcam und/oder Emulator neu starten
menu.hint_cec_mode CEC-Modus
menu.hint_cec_standby CEC-Standby
@@ -1170,6 +1198,7 @@ menu.hint_colors Konfigurieren Sie die Menü-Farben
menu.hint_colors_shadow Einstellen der Schattenfarbe
menu.hint_content_back Ändern Sie die Hintergrundfarbe für den Fensterinhalt
menu.hint_content_textcolor Ändern Sie die Textfarbe für den Fensterinhalt
menu.hint_daemon_control An- und Abschalten von System-Diensten
menu.hint_dboxinfo Informationen über CPU und Arbeitsspeicher der Box
menu.hint_delete_channels Löschen aller Kanäle
menu.hint_delete_removed Lösche das Bouquet 'Gelöschte Kanäle'
@@ -1419,7 +1448,6 @@ menu.hint_network IP-Adresse, Gateway, DNS, Zeit-Sync, Netzwerk-Freigaben, Diens
menu.hint_new_zap_mode Aktiviert Quickzap in der Kanalliste. Nach Betätigen der Mute-Taste wird mit den Hoch/Runter-Tasten direkt umgeschalten
menu.hint_next Weiter zum nächsten Menü.\nDie Taste 'Menü' schließt alle Menüs
menu.hint_next_brief Weiter zum nächsten Menü
menu.hint_nimenu Konfiguration von Softcams, Plugins, Tools usw.
menu.hint_numeric_adjust Bei numerischer Programmwahl die Kanalliste am neu gewählten Programm ausrichten
menu.hint_opkg Software-Pakete installieren oder vorhandene aktualisieren
menu.hint_opkg_feed_addresses_edit Bearbeiten von Feed-Adressen
@@ -1445,7 +1473,7 @@ menu.hint_plugin_type_games Legt fest, ob Spiele im Benutzermenü unter der Rubr
menu.hint_plugin_type_lua Legt fest, ob Plugins im Benutzermenü unter der Rubrik 'Plugin-Typen' gezeigt werden sollen
menu.hint_plugin_type_scripts Legt fest, ob Skripte im Benutzermenü unter der Rubrik 'Plugin-Typen' gezeigt werden sollen
menu.hint_plugin_type_tools Legt fest, ob Werkzeuge im Benutzermenü unter der Rubrik 'Plugin-Typen' gezeigt werden sollen
menu.hint_plugins_control Verwaltung von installierten Plugins und Diensten
menu.hint_plugins_control Plugin-Einstellungen und Verwaltung von installierten Plugins
menu.hint_plugins_hdd_dir Auswahl des Verzeichnisses zum Laden der Plugins von einem externen Datenträger
menu.hint_plugins_hide Integrierte Plugins oder Plugins in den Benutzermenüs verstecken oder anzeigen
menu.hint_power_leds Konfiguriert das Verhalten der LEDs an der Power-Taste
@@ -2062,12 +2090,14 @@ mpkey.stop Stopp
mpkey.subtitle Untertitel
mpkey.time Zeitanzeige
netfs.active_onoff Eintrag aktiv
netfs.automount_edit auto.net bearbeiten
netfs.automount_head NetFS Einstellungen
netfs.automount_intro Einträge für auto.net
netfs.automount_intro_mounts NetFS-Mounts bearbeiten
netfs.automount_write Einstellungen speichern und auto.net schreiben
netfs.automount_write_info auto.net wurde geschrieben
netfs.dump Dump
netfs.fstab_edit fstab bearbeiten
netfs.fstab_domount NetFS-Verzeichnisse anhängen (mount)
netfs.fstab_domount_info '/etc/init.d/fstab start_netfs' wird ausgeführt
netfs.fstab_doumount NetFS-Verzeichnisse aushängen (umount)
@@ -2095,8 +2125,8 @@ networkmenu.ipaddress IP
networkmenu.mount Netzwerkfreigaben bearbeiten
networkmenu.nameserver Nameserver
networkmenu.netmask Netzmaske
networkmenu.ntpatboot Zeit beim Booten synchr.
networkmenu.ntpenable Zeit per INet synchronisieren
networkmenu.ntpatboot Zeit beim Booten synchronisieren
networkmenu.ntpenable Zeit synchronisieren per
networkmenu.ntprefresh NTP/DVB-Aktualisierung
networkmenu.ntprefresh_hint1 NTP/DVB-Time-Sync [min]
networkmenu.ntprefresh_hint2 braucht Reboot oder EPG-Reset
@@ -2141,8 +2171,6 @@ nfs.umounterror Umount-Fehler
nfs.username Benutzername
nfsmenu.head NFS/CIFS/FTPFS Einstellungen
ni NI \o/
nimenu.head NI-Einstellungen
nimenu.head_special Extra-Einstellungen
nvod.percentage (%d%% vorbei)
nvod.starting (Beginn in %d min)
nvodselector.directormode Bildregie-Modus
@@ -2281,32 +2309,8 @@ pinprotection.head PIN-Abfrage
pinprotection.wrongcode Geben Sie den Code nocheinmal ein!
plugin.hide_no Anzeigen
plugin.hide_yes Verstecken
plugin.item_crond_desc cron Daemon kann zeitgesteuerte Aufgaben ausführen
plugin.item_crond_name crond
plugin.item_djmount_desc UPnP AV Client kann den Inhalt von Media-Servern mounten
plugin.item_djmount_name djmount
plugin.item_dropbear_desc SSH2 Server und Client
plugin.item_dropbear_name Dropbear
plugin.item_emmremind_desc Zeigt eine Änderung der EMM's in den Infoicons an
plugin.item_emmremind_name EMM-Änderungsbenachrichtigung
plugin.item_fcm_desc Zeigt die Anrufliste der FRITZ!Box und noch vieles mehr ...
plugin.item_fcm_name FritzCallMonitor
plugin.item_inadyn_desc DynDNS Client
plugin.item_inadyn_name Inadyn
plugin.item_nfsserver_desc NFS Kernel Server
plugin.item_nfsserver_name NFS-Server
plugin.item_sambaserver_desc Server-Message-Block-Protokoll (SMB) Implementierung
plugin.item_sambaserver_name Samba-Server
plugin.item_tuxcald_desc Kalenderplugin
plugin.item_tuxcald_name TuxCal
plugin.item_tuxmaild_desc Mailplugin (IMAP/SMTP)
plugin.item_tuxmaild_name TuxMail
plugin.item_ushare_desc A/V und DLNA Medienserver
plugin.item_ushare_name uShare
plugin.item_xupnpd_desc eXtensible UPnP agent - DLNA Medienserver für IPTV
plugin.item_xupnpd_name xupnpd
plugins.control Plugins und Services verwalten
plugins.hdd_dir Externes Plugin-Verz.
plugins.control Plugins verwalten
plugins.hdd_dir Externes Plugin-Verzeichnis
plugins.hide Plugins verstecken oder anzeigen
plugins.no_plugin Kein Plugin
plugins.result Pluginausgabe
@@ -2557,7 +2561,7 @@ settings.teams.backup Sichern
settings.teams.backup_failed Sicherung fehlgeschlagen!
settings.teams.backup_to Sichern nach
settings.teams.help Hilfe
settings.teams.help_text In diesem Menü können Einstellungen gesichert und\nwiederhergestellt werden, die zu folgenden Team-Images\nkompatibel sind:\n \n - BluePeer HD\n - NI CS-Image\n \nGesichert werden:\n \n * Kanallisten\n * Timer und Timer-Einstellungen\n * Netzwerkeinstellungen (LAN und WLAN)
settings.teams.help_text In diesem Menü können Einstellungen\ngesichert und wiederhergestellt werden,\ndie zu folgenden Team-Images kompatibel sind:\n \n - BluePeer HD\n - NI-Image\n \nGesichert werden:\n \n * Kanallisten\n * Timer und Timer-Einstellungen\n * Netzwerkeinstellungen (LAN und WLAN)
settings.teams.restore Wiederherstellen
settings.teams.restore_warn Team-übergreifende Einstellungen werden ersetzt.\nDie Box wird neu gestartet.\nWeiter?
shoutcast.dev_id SHOUTcast Dev ID

View File

@@ -252,6 +252,8 @@ camd_item_gbox_hint GBox - Softcam and emulator
camd_item_gbox_name gbox
camd_item_mgcamd_hint MGCamd - Emulator
camd_item_mgcamd_name mgcamd
camd_item_ncam_hint NCam - Softcam and emulator
camd_item_ncam_name ncam
camd_item_newcs_hint NewCS - Softcam
camd_item_newcs_name newcs
camd_item_oscam_hint OSCam - Softcam
@@ -388,6 +390,31 @@ crossteam.hint_settings_teams Save and restore settings, which\nare compatible w
crossteam.hint_settings_teams_backup Save cross-team settings
crossteam.hint_settings_teams_help Help about cross-team settings
crossteam.hint_settings_teams_restore Restore cross-team settings
daemon_control Daemon control
daemon_item.crond_desc Cron daemon allows scheduled tasks
daemon_item.crond_name crond
daemon_item.djmount_desc UPnP AV client allows to mount media-servers
daemon_item.djmount_name djmount
daemon_item.dropbear_desc SSH2 server and client
daemon_item.dropbear_name Dropbear
daemon_item.emmremind_desc Show different EMM's in the Infoicons
daemon_item.emmremind_name EMM-Change Notification
daemon_item.fcm_desc Shows FRITZ!Box call list and much more ...
daemon_item.fcm_name FritzCallMonitor
daemon_item.inadyn_desc DynDNS client
daemon_item.inadyn_name Inadyn
daemon_item.nfsserver_desc NFS kernel server
daemon_item.nfsserver_name NFS server
daemon_item.sambaserver_desc Server-Message-Block-Protocol (SMB) implementation
daemon_item.sambaserver_name Samba server
daemon_item.tuxcald_desc Calender plugin daemon
daemon_item.tuxcald_name TuxCal
daemon_item.tuxmaild_desc Mailplugin (IMAP/SMTP) daemon
daemon_item.tuxmaild_name TuxMail
daemon_item.ushare_desc A/V and DLNA Mediaserver
daemon_item.ushare_name uShare
daemon_item.xupnpd_desc eXtensible UPnP agent - DLNA Mediaserver for IPTV
daemon_item.xupnpd_name xupnpd
date.Apr Apr
date.Aug Aug
date.Dec Dec
@@ -908,7 +935,7 @@ infoicons_flag_name4 Custom
infoicons_flag_name5 Custom
infoicons_flag_name6 Custom
infoicons_flag_name7 Custom
infoicons_head Infoicons Settings
infoicons_head Infoicons
infoicons_infoviewer with Infoviewer
infoicons_modeicon Infoicons
infoicons_msg_start starting Infoicons
@@ -1135,7 +1162,7 @@ menu.hint_blank_screen Turn off VideoDecoder until next event (keypress, timer e
menu.hint_buildinfo Information about compilers, compiler flags, kernel
menu.hint_ca_init Configuration of CA-system hardware, CA-module and card slots
menu.hint_cache_txt Start teletext caching after channel switch
menu.hint_camd Softcam and emulator settings\nStart, stop, version info
menu.hint_camd_control Softcams and emulators\nStart, stop, version info
menu.hint_camd_reset Restart the active softcam and/or emulator
menu.hint_cec_mode CEC mode
menu.hint_cec_standby CEC standby
@@ -1170,6 +1197,7 @@ menu.hint_colors Configure GUI colors
menu.hint_colors_shadow Setup for shadow color.
menu.hint_content_back Change GUI window background color
menu.hint_content_textcolor Change GUI window text color
menu.hint_daemon_control Start and stop system-daemons
menu.hint_dboxinfo Information about box cpu and storage
menu.hint_delete_channels Remove all channels
menu.hint_delete_removed Delete the channels in the 'Removed channels' boquet
@@ -1419,7 +1447,6 @@ menu.hint_network IP address, gateway, DNS, Time sync\nNetwork shares and servic
menu.hint_new_zap_mode Allow channel switch while browsing\n(toggle mode with 'mute' in channel list)
menu.hint_next Continue to next menu\nPress menu key to close all menus
menu.hint_next_brief Continue to next menu
menu.hint_nimenu Configuration of softcams, plugins, tools etc.
menu.hint_numeric_adjust Adjust channel list mode on numeric zap
menu.hint_opkg Install or update software packages
menu.hint_opkg_feed_addresses_edit Edit feed addresses
@@ -1445,7 +1472,7 @@ menu.hint_plugin_type_games Show games in usermenu at selection 'Plugin types'
menu.hint_plugin_type_lua Show plugins in usermenu at selection 'Plugin types'
menu.hint_plugin_type_scripts Show scripts in usermenu at selection 'Plugin types'
menu.hint_plugin_type_tools Show tools in usermenu at selection 'Plugin types'
menu.hint_plugins_control Configuration of installed plugins and services
menu.hint_plugins_control Plugin settings and management of installed plugins
menu.hint_plugins_hdd_dir Select directory to load\nplugins from
menu.hint_plugins_hide Hide or show integrated plugins or plugins in user menus
menu.hint_power_leds Configure power-button LEDs behavior
@@ -2062,12 +2089,14 @@ mpkey.stop Stop
mpkey.subtitle Subtitles
mpkey.time Show time
netfs.active_onoff Entry active
netfs.automount_edit Edit auto.net
netfs.automount_head NetFS settings
netfs.automount_intro /etc/auto.net entries
netfs.automount_intro_mounts edit NetFS mounts
netfs.automount_write save settings and write auto.net
netfs.automount_write_info auto.net written
netfs.dump dump
netfs.fstab_edit Edit fstab
netfs.fstab_domount mount NetFS directory
netfs.fstab_domount_info Running '/etc/init.d/fstab start_netfs'
netfs.fstab_doumount unmount NetFS directory
@@ -2095,7 +2124,7 @@ networkmenu.ipaddress IP address
networkmenu.mount Edit network shares
networkmenu.nameserver Name server
networkmenu.netmask Netmask
networkmenu.ntpatboot Sync time while booting
networkmenu.ntpatboot Syncronize time at boot
networkmenu.ntpenable Syncronisation via
networkmenu.ntprefresh NTP/DVB-Refresh
networkmenu.ntprefresh_hint1 NTP/DVB-Time-Sync in minutes
@@ -2141,8 +2170,6 @@ nfs.umounterror error umounting volume
nfs.username username
nfsmenu.head NFS/CIFS/FTPFS settings
ni NI \o/
nimenu.head NI-Settings
nimenu.head_special Special settings
nvod.percentage (%d%% over)
nvod.starting (starting in %d min)
nvodselector.directormode Director mode
@@ -2281,32 +2308,8 @@ pinprotection.head Enter PIN code
pinprotection.wrongcode PIN-Code was wrong! Try again.
plugin.hide_no Show
plugin.hide_yes Hide
plugin.item_crond_desc Cron daemon allows scheduled tasks
plugin.item_crond_name crond
plugin.item_djmount_desc UPnP AV Client allows to mount media-servers
plugin.item_djmount_name djmount
plugin.item_dropbear_desc SSH2 server und client
plugin.item_dropbear_name Dropbear
plugin.item_emmremind_desc Display different EMM's to the Infoicons
plugin.item_emmremind_name EMM-Change Notification
plugin.item_fcm_desc Shows FRITZ!Box call list and much more ...
plugin.item_fcm_name FritzCallMonitor
plugin.item_inadyn_desc DynDNS client
plugin.item_inadyn_name Inadyn
plugin.item_nfsserver_desc NFS kernel server
plugin.item_nfsserver_name NFS-Server
plugin.item_sambaserver_desc Server-Message-Block-Protokoll (SMB) implementation
plugin.item_sambaserver_name Samba-Server
plugin.item_tuxcald_desc Calender-plugin
plugin.item_tuxcald_name TuxCal
plugin.item_tuxmaild_desc Mailplugin (IMAP/SMTP)
plugin.item_tuxmaild_name TuxMail
plugin.item_ushare_desc A/V and DLNA Mediaserver
plugin.item_ushare_name uShare
plugin.item_xupnpd_desc eXtensible UPnP agent - DLNA Mediaserver for IPTV
plugin.item_xupnpd_name xupnpd
plugins.control Control plugins and services
plugins.hdd_dir Plugin HDD dir.
plugins.control Control plugins
plugins.hdd_dir External plugin directory
plugins.hide Hide or show plugins
plugins.no_plugin No plugin
plugins.result plugin output
@@ -2557,7 +2560,7 @@ settings.teams.backup Save
settings.teams.backup_failed Backup failed!
settings.teams.backup_to Saving to
settings.teams.help Help
settings.teams.help_text In this menu, settings can be saved and restored,\nwhich are compatible with these Team-Images:\n \n - BluePeer HD\n - NI CS-Image\n \nSaved will be:\n \n * Channellists\n * Timer and Timer-Settings\n * Network-Settings (LAN and WLAN)
settings.teams.help_text In this menu can settings be saved and restored,\nwhich are compatible with following Team-Images:\n \n - BluePeer HD\n - NI-Image\n \nSaved will be:\n \n * Channellists\n * Timer and timer-settings\n * Network-settings (LAN and WLAN)
settings.teams.restore Restore
settings.teams.restore_warn This will replace all cross-team settings and reboot\nContinue ?
shoutcast.dev_id SHOUTcast Dev ID

View File

@@ -2,6 +2,7 @@
{=var-set:x_cs2gbox={=script:Y_NI_Tools is_exec cs2gbox=}=}
{=var-set:x_osemu={=script:Y_NI_Tools is_exec osemu=}=}
{=var-set:x_oscam={=script:Y_NI_Tools is_exec oscam=}=}
{=var-set:x_ncam={=script:Y_NI_Tools is_exec ncam=}=}
{=var-set:x_doscam={=script:Y_NI_Tools is_exec doscam=}=}
{=var-set:x_mgcamd={=script:Y_NI_Tools is_exec mgcamd=}=}
{=var-set:x_newcs={=script:Y_NI_Tools is_exec newcs=}=}
@@ -10,11 +11,13 @@
{=var-set:r_cs2gbox={=script:Y_NI_Tools is_running cs2gbox=}=}
{=var-set:r_osemu={=script:Y_NI_Tools is_running osemu=}=}
{=var-set:r_oscam={=script:Y_NI_Tools is_running oscam=}=}
{=var-set:r_ncam={=script:Y_NI_Tools is_running ncam=}=}
{=var-set:r_doscam={=script:Y_NI_Tools is_running doscam=}=}
{=var-set:r_mgcamd={=script:Y_NI_Tools is_running mgcamd=}=}
{=var-set:r_newcs={=script:Y_NI_Tools is_running newcs=}=}
{=var-set:oscamport={=script:Y_NI_Tools get_oscam_webif_port=}=}
{=var-set:ncamport={=script:Y_NI_Tools get_ncam_webif_port=}=}
{=var-set:doscamport={=script:Y_NI_Tools get_doscam_webif_port=}=}
{=include-block:Y_NI_Blocks.txt;head=}
@@ -312,6 +315,77 @@ input[type="button"], .tools select {
</td>
</tr>
<tr class="list">
{=var-set:camd=ncam=}
<td>
<img src="images/{=if-equal:{=var-get:r_{=var-get:camd=}=}~true~check_green~x_red=}.png" class="status">
{=if-equal:{=var-get:r_{=var-get:camd=}=}~true~
<u><a href="#" onclick='goPort("{=var-get:oscamport=}");'>{=var-get:camd=}</a></u>
~
{=var-get:camd=}
=}
</td>
<td>
<span class="vinfo">{=script:Y_NI_Tools vinfo {=var-get:camd=}=}</span>
</td>
{=if-equal:{=var-get:x_{=var-get:camd=}=}~true~
{=if-equal:{=var-get:r_{=var-get:camd=}=}~true~
<td>
<input type="button" value="{=L:ni.stop=}" title="{=L:ni.stop=} {=var-get:camd=}" onclick='Y_NI_Tools("{=var-get:camd=}stop", 10000);' />
</td>
<td>
<input type="button" value="{=L:ni.reset=}" title="{=L:ni.reset=} {=var-get:camd=}" onclick='Y_NI_Tools("{=var-get:camd=}reset", 10000);' />
</td>
~
<td>
<input type="button" value="{=L:ni.start=}" title="{=L:ni.start=} {=var-get:camd=}" onclick='Y_NI_Tools("{=var-get:camd=}start", 10000);' />
</td>
<td>
</td>
=}
~
<td>
</td>
<td>
</td>
=}
<td>
<span class="tools">
<select name="{=var-get:camd=}_tools" size="1" onchange="this.options[this.selectedIndex].onclick();">
<option onclick='return false;' selected>{=L:ni.camd-tools=} {=var-get:camd=}</option>
<option onclick='return false;'> {=L:ni.camd-tools.line=} </option>
<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/ncam.conf","edit", "width=800,height=600,resizable=yes");'>
{=L:ni.edit=}: ncam.conf
</option>
<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/ncam.dvbapi","edit", "width=800,height=600,resizable=yes");'>
{=L:ni.edit=}: ncam.dvbapi
</option>
<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/ncam.server","edit", "width=800,height=600,resizable=yes");'>
{=L:ni.edit=}: ncam.server
</option>
<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/ncam.services","edit", "width=800,height=600,resizable=yes");'>
{=L:ni.edit=}: ncam.services
</option>
<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/ncam.srvid","edit", "width=800,height=600,resizable=yes");'>
{=L:ni.edit=}: ncam.srvid
</option>
<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/ncam.user","edit", "width=800,height=600,resizable=yes");'>
{=L:ni.edit=}: ncam.user
</option>
{=if-equal:{=var-get:r_{=var-get:camd=}=}~true~
<option> {=L:ni.camd-tools.line=} </option>
<option onclick='Y_NI_Tools("ecminfo");'>
{=L:ni.camd-tools.ecminfo=}
</option>
<option onclick='Y_NI_Tools("ncamversion");'>
{=L:ni.camd-tools.ncamversion=}
</option>
~
=}
</select>
</span>
</td>
</tr>
<tr class="list">
{=var-set:camd=doscam=}
<td>
<img src="images/{=if-equal:{=var-get:r_{=var-get:camd=}=}~true~check_green~x_red=}.png" class="status">

View File

@@ -659,6 +659,7 @@ ni.camd-tools.pidinfo=PID-Informationen
ni.camd-tools.mgshareinfo=NewCamd Verbindungen
ni.camd-tools.cs2gboxinfo=Allgemeine Informationen
ni.camd-tools.oscamversion=Allgemeine Informationen
ni.camd-tools.ncamversion=Allgemeine Informationen
ni.camd-tools.doscamversion=Allgemeine Informationen
ni.pzapit-control=PZapit

View File

@@ -662,6 +662,7 @@ ni.camd-tools.pidinfo=PID-Informations
ni.camd-tools.mgshareinfo=NewCamd Lines
ni.camd-tools.cs2gboxinfo=Common Informations
ni.camd-tools.oscamversion=Common Informations
ni.camd-tools.ncamversion=Common Informations
ni.camd-tools.doscamversion=Common Informations
ni.pzapit-control=PZapit

View File

@@ -88,6 +88,20 @@ case "$1" in
echo "[$BNAME] oscam-reset"
/etc/init.d/emu reset oscam >/dev/console
;;
ncam_start)
echo "[$BNAME] ncam-start"
touch /var/etc/.ncam
/etc/init.d/emu start ncam >/dev/console
;;
ncam_stop)
echo "[$BNAME] ncam-stop"
rm -rf /var/etc/.ncam
/etc/init.d/emu stop ncam >/dev/console
;;
ncam_reset)
echo "[$BNAME] ncam-reset"
/etc/init.d/emu reset ncam >/dev/console
;;
doscam_start)
echo "[$BNAME] doscam-start"
touch /var/etc/.doscam

View File

@@ -258,6 +258,9 @@ case "$action" in
oscamstop) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh oscam_stop;;
oscamstart) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh oscam_start;;
oscamreset) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh oscam_reset;;
ncamstop) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh ncam_stop;;
ncamstart) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh ncam_start;;
ncamreset) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh ncam_reset;;
doscamstop) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh doscam_stop;;
doscamstart) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh doscam_start;;
doscamreset) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh doscam_reset;;
@@ -290,6 +293,7 @@ case "$action" in
ecminfo) file2msg /tmp/ecm.info "ecm-info";;
pidinfo) file2msg /tmp/pid.info "pid-info";;
oscamversion) file2msg /tmp/.oscam/oscam.version "oscam-info";;
ncamversion) file2msg /tmp/.ncam/ncam.version "ncam-info";;
doscamversion) file2msg /tmp/.doscam/doscam.version "doscam-info";;
get_oscam_webif_port)
@@ -300,6 +304,14 @@ case "$action" in
printf "%s" ${_port:-8080}
;;
get_ncam_webif_port)
if [ -e %(CONFIGDIR)/ncam.conf ]; then
_port=$(grep -m 1 -i "^[:space:]*httpport" %(CONFIGDIR)/ncam.conf | cut -d'=' -f2)
_port=$(echo $_port | dos2unix -u)
fi
printf "%s" ${_port:-8181}
;;
get_doscam_webif_port)
if [ -e %(CONFIGDIR)/doscam.cfg ]; then
_port=$(grep -m 1 -i "^[:space:]*httpport" %(CONFIGDIR)/doscam.cfg | cut -d'=' -f2)