diff --git a/data/y-web/Y_NI_Camd-control.yhtm b/data/y-web/Y_NI_Camd-control.yhtm index 46954bd9c..6f482b38a 100644 --- a/data/y-web/Y_NI_Camd-control.yhtm +++ b/data/y-web/Y_NI_Camd-control.yhtm @@ -2,6 +2,7 @@ {=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_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_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_osmod={=script:Y_NI_Tools is_running osmod=}=} {=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_mgcamd={=script:Y_NI_Tools is_running mgcamd=}=} {=var-set:oscamport={=script:Y_NI_Tools get_oscam_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=}=} {=include-block:Y_NI_Blocks.txt;head=} @@ -355,6 +358,71 @@ input[type="button"], .tools select { + {=var-set:camd=cccam=} + + + {=if-equal:{=var-get:r_{=var-get:camd=}=}~true~ + {=var-get:camd=} + ~ + {=var-get:camd=} + =} + + + {=script:Y_NI_Tools vinfo {=var-get:camd=}=} + + {=if-equal:{=var-get:x_{=var-get:camd=}=}~true~ + {=if-equal:{=var-get:r_{=var-get:camd=}=}~true~ + + + + + + + ~ + + + + + + =} + ~ + + + + + =} + + + + + + + {=var-set:camd=doscam=} diff --git a/data/y-web/scripts/Y_NI_Camd-control.sh b/data/y-web/scripts/Y_NI_Camd-control.sh index fee58c969..ac14bb912 100644 --- a/data/y-web/scripts/Y_NI_Camd-control.sh +++ b/data/y-web/scripts/Y_NI_Camd-control.sh @@ -88,6 +88,20 @@ case "$1" in echo "[$BNAME] ncam-reset" /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) echo "[$BNAME] doscam-start" touch /var/etc/.doscam diff --git a/data/y-web/scripts/Y_NI_Tools.sh b/data/y-web/scripts/Y_NI_Tools.sh index 76d4c70ba..07bbd3cb2 100644 --- a/data/y-web/scripts/Y_NI_Tools.sh +++ b/data/y-web/scripts/Y_NI_Tools.sh @@ -258,6 +258,9 @@ case "$action" in 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;; + 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;; doscamstart) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh doscam_start;; 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";; oscamversion) file2msg /tmp/.oscam/oscam.version "oscam-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";; get_oscam_webif_port) @@ -305,6 +309,14 @@ case "$action" in 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) if [ -e %(CONFIGDIR)/doscam.cfg ]; then _port=$(grep -m 1 -i "^[:space:]*httpport" %(CONFIGDIR)/doscam.cfg | cut -d'=' -f2)