add cccam to webif

Origin commit data
------------------
Branch: ni/coolstream
Commit: fda24c0888
Author: Knicko <knicko@glj.servebbs.com>
Date: 2019-06-26 (Wed, 26 Jun 2019)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Knicko
2019-06-26 22:06:43 +02:00
committed by vanhofen
parent cb66e96c9f
commit 6c00311be6
3 changed files with 94 additions and 0 deletions

View File

@@ -2,6 +2,7 @@
{=var-set:x_oscam={=script:Y_NI_Tools is_exec oscam=}=} {=var-set:x_oscam={=script:Y_NI_Tools is_exec oscam=}=}
{=var-set:x_osmod={=script:Y_NI_Tools is_exec osmod=}=} {=var-set:x_osmod={=script:Y_NI_Tools is_exec osmod=}=}
{=var-set:x_ncam={=script:Y_NI_Tools is_exec ncam=}=} {=var-set:x_ncam={=script:Y_NI_Tools is_exec ncam=}=}
{=var-set:x_cccam={=script:Y_NI_Tools is_exec cccam=}=}
{=var-set:x_doscam={=script:Y_NI_Tools is_exec doscam=}=} {=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_mgcamd={=script:Y_NI_Tools is_exec mgcamd=}=}
@@ -9,11 +10,13 @@
{=var-set:r_oscam={=script:Y_NI_Tools is_running oscam=}=} {=var-set:r_oscam={=script:Y_NI_Tools is_running oscam=}=}
{=var-set:r_osmod={=script:Y_NI_Tools is_running osmod=}=} {=var-set:r_osmod={=script:Y_NI_Tools is_running osmod=}=}
{=var-set:r_ncam={=script:Y_NI_Tools is_running ncam=}=} {=var-set:r_ncam={=script:Y_NI_Tools is_running ncam=}=}
{=var-set:r_cccam={=script:Y_NI_Tools is_running cccam=}=}
{=var-set:r_doscam={=script:Y_NI_Tools is_running doscam=}=} {=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_mgcamd={=script:Y_NI_Tools is_running mgcamd=}=}
{=var-set:oscamport={=script:Y_NI_Tools get_oscam_webif_port=}=} {=var-set:oscamport={=script:Y_NI_Tools get_oscam_webif_port=}=}
{=var-set:ncamport={=script:Y_NI_Tools get_ncam_webif_port=}=} {=var-set:ncamport={=script:Y_NI_Tools get_ncam_webif_port=}=}
{=var-set:cccamport={=script:Y_NI_Tools get_cccam_webif_port=}=}
{=var-set:doscamport={=script:Y_NI_Tools get_doscam_webif_port=}=} {=var-set:doscamport={=script:Y_NI_Tools get_doscam_webif_port=}=}
{=include-block:Y_NI_Blocks.txt;head=} {=include-block:Y_NI_Blocks.txt;head=}
@@ -355,6 +358,71 @@ input[type="button"], .tools select {
</td> </td>
</tr> </tr>
<tr class="list"> <tr class="list">
{=var-set:camd=cccam=}
<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:cccamport=}");'>{=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=/var/etc/CCcam.cfg","edit", "width=800,height=600,resizable=yes");'>
{=L:ni.edit=}: CCcam.cfg
</option>
<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=/var/etc/CCcam.channelinfo","edit", "width=800,height=600,resizable=yes");'>
{=L:ni.edit=}: CCcam.channelinfo
</option>
<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=/var/etc/CCcam.prio","edit", "width=800,height=600,resizable=yes");'>
{=L:ni.edit=}: CCcam.prio
</option>
<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=/var/etc/CCcam.providers","edit", "width=800,height=600,resizable=yes");'>
{=L:ni.edit=}: CCcam.providers
</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("cccamversion");'>
{=L:ni.camd-tools.cccamversion=}
</option>
~
=}
</select>
</span>
</td>
</tr>
<tr class="list">
{=var-set:camd=doscam=} {=var-set:camd=doscam=}
<td> <td>
<img src="images/{=if-equal:{=var-get:r_{=var-get:camd=}=}~true~check_green~x_red=}.png" class="status"> <img src="images/{=if-equal:{=var-get:r_{=var-get:camd=}=}~true~check_green~x_red=}.png" class="status">

View File

@@ -88,6 +88,20 @@ case "$1" in
echo "[$BNAME] ncam-reset" echo "[$BNAME] ncam-reset"
/etc/init.d/camd reset ncam >/dev/console /etc/init.d/camd reset ncam >/dev/console
;; ;;
cccam_start)
echo "[$BNAME] cccam-start"
touch /var/etc/.cccam
/etc/init.d/camd start cccam >/dev/console
;;
cccam_stop)
echo "[$BNAME] cccam-stop"
rm -rf /var/etc/.cccam
/etc/init.d/camd stop cccam >/dev/console
;;
cccam_reset)
echo "[$BNAME] cccam-reset"
/etc/init.d/camd reset cccam >/dev/console
;;
doscam_start) doscam_start)
echo "[$BNAME] doscam-start" echo "[$BNAME] doscam-start"
touch /var/etc/.doscam touch /var/etc/.doscam

View File

@@ -258,6 +258,9 @@ case "$action" in
ncamstop) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh ncam_stop;; ncamstop) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh ncam_stop;;
ncamstart) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh ncam_start;; ncamstart) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh ncam_start;;
ncamreset) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh ncam_reset;; ncamreset) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh ncam_reset;;
cccamstop) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh ccccam_stop;;
cccamstart) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh ccccam_start;;
cccamreset) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh cccam_reset;;
doscamstop) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh doscam_stop;; doscamstop) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh doscam_stop;;
doscamstart) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh doscam_start;; doscamstart) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh doscam_start;;
doscamreset) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh doscam_reset;; doscamreset) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh doscam_reset;;
@@ -287,6 +290,7 @@ case "$action" in
pidinfo) file2msg /tmp/pid.info "pid-info";; pidinfo) file2msg /tmp/pid.info "pid-info";;
oscamversion) file2msg /tmp/.oscam/oscam.version "oscam-info";; oscamversion) file2msg /tmp/.oscam/oscam.version "oscam-info";;
ncamversion) file2msg /tmp/.ncam/ncam.version "ncam-info";; ncamversion) file2msg /tmp/.ncam/ncam.version "ncam-info";;
ccccamversion) file2msg /tmp/.cccam/cccam.version "cccam-info";;
doscamversion) file2msg /tmp/.doscam/doscam.version "doscam-info";; doscamversion) file2msg /tmp/.doscam/doscam.version "doscam-info";;
get_oscam_webif_port) get_oscam_webif_port)
@@ -305,6 +309,14 @@ case "$action" in
printf "%s" ${_port:-8181} printf "%s" ${_port:-8181}
;; ;;
get_cccam_webif_port)
if [ -e %(CONFIGDIR)/CCcam.cfg ]; then
_port=$(grep -m 1 -i "^[:space:]*WEBINFO LISTEN PORT" /var/etc/CCcam.cfg | cut -d':' -f2)
_port=$(echo $_port | dos2unix -u)
fi
printf "%s" ${_port:-16001}
;;
get_doscam_webif_port) get_doscam_webif_port)
if [ -e %(CONFIGDIR)/doscam.cfg ]; then if [ -e %(CONFIGDIR)/doscam.cfg ]; then
_port=$(grep -m 1 -i "^[:space:]*httpport" %(CONFIGDIR)/doscam.cfg | cut -d'=' -f2) _port=$(grep -m 1 -i "^[:space:]*httpport" %(CONFIGDIR)/doscam.cfg | cut -d'=' -f2)