yweb: fix osmod webif port

Origin commit data
------------------
Branch: ni/coolstream
Commit: 67e97fecd7
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-06-26 (Wed, 26 Jun 2019)

Origin message was:
------------------
- yweb: fix osmod webif port

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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2019-06-26 22:19:07 +02:00
parent 6c00311be6
commit 27886f568f
2 changed files with 10 additions and 1 deletions

View File

@@ -15,6 +15,7 @@
{=var-set:r_mgcamd={=script:Y_NI_Tools is_running mgcamd=}=}
{=var-set:oscamport={=script:Y_NI_Tools get_oscam_webif_port=}=}
{=var-set:osmodport={=script:Y_NI_Tools get_osmod_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=}=}
@@ -220,7 +221,7 @@ input[type="button"], .tools select {
<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>
<u><a href="#" onclick='goPort("{=var-get:osmodport=}");'>{=var-get:camd=}</a></u>
~
{=var-get:camd=}
=}

View File

@@ -301,6 +301,14 @@ case "$action" in
printf "%s" ${_port:-8080}
;;
get_osmod_webif_port)
if [ -e %(CONFIGDIR)/oscam.conf ]; then
_port=$(grep -m 1 -i "^[:space:]*httpport" %(CONFIGDIR)/oscam.conf | cut -d'=' -f2)
_port=$(echo $_port | dos2unix -u)
fi
printf "%s" ${_port:-8888}
;;
get_ncam_webif_port)
if [ -e %(CONFIGDIR)/ncam.conf ]; then
_port=$(grep -m 1 -i "^[:space:]*httpport" %(CONFIGDIR)/ncam.conf | cut -d'=' -f2)