yWeb: merge Y_NI_Tools.sh into Y_Tools.sh

Origin commit data
------------------
Branch: ni/coolstream
Commit: ca3a58ce3f
Author: vanhofen <vanhofen@gmx.de>
Date: 2023-03-09 (Thu, 09 Mar 2023)

Origin message was:
------------------
- yWeb: merge Y_NI_Tools.sh into Y_Tools.sh

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

------------------
This commit was generated by Migit

data/y-web/Y_About_Image.yhtm

@@ -1,20 +1,20 @@
-{=var-set:_mtd_info_dev={=script:Y_NI_Tools get_mtd_info dev=}=}
+{=var-set:_mtd_info_dev={=script:Y_Tools get_mtd_info dev=}=}
-{=var-set:_mtd_info_name={=script:Y_NI_Tools get_mtd_info name=}=}
+{=var-set:_mtd_info_name={=script:Y_Tools get_mtd_info name=}=}
 
-{=var-set:_root_used_percent={=script:Y_NI_Tools get_flash_info root used_percent=}=}
+{=var-set:_root_used_percent={=script:Y_Tools get_flash_info root used_percent=}=}
-{=var-set:_root_total={=script:Y_NI_Tools get_flash_info root total=}=}
+{=var-set:_root_total={=script:Y_Tools get_flash_info root total=}=}
-{=var-set:_root_used={=script:Y_NI_Tools get_flash_info root used=}=}
+{=var-set:_root_used={=script:Y_Tools get_flash_info root used=}=}
-{=var-set:_root_free={=script:Y_NI_Tools get_flash_info root free=}=}
+{=var-set:_root_free={=script:Y_Tools get_flash_info root free=}=}
 
-{=var-set:_var_used_percent={=script:Y_NI_Tools get_flash_info var used_percent=}=}
+{=var-set:_var_used_percent={=script:Y_Tools get_flash_info var used_percent=}=}
-{=var-set:_var_total={=script:Y_NI_Tools get_flash_info var total=}=}
+{=var-set:_var_total={=script:Y_Tools get_flash_info var total=}=}
-{=var-set:_var_used={=script:Y_NI_Tools get_flash_info var used=}=}
+{=var-set:_var_used={=script:Y_Tools get_flash_info var used=}=}
-{=var-set:_var_free={=script:Y_NI_Tools get_flash_info var free=}=}
+{=var-set:_var_free={=script:Y_Tools get_flash_info var free=}=}
 
-{=var-set:_mem_used_percent={=script:Y_NI_Tools get_mem_info used_percent=}=}
+{=var-set:_mem_used_percent={=script:Y_Tools get_mem_info used_percent=}=}
-{=var-set:_mem_total={=script:Y_NI_Tools get_mem_info total=}=}
+{=var-set:_mem_total={=script:Y_Tools get_mem_info total=}=}
-{=var-set:_mem_used={=script:Y_NI_Tools get_mem_info used=}=}
+{=var-set:_mem_used={=script:Y_Tools get_mem_info used=}=}
-{=var-set:_mem_free={=script:Y_NI_Tools get_mem_info free=}=}
+{=var-set:_mem_free={=script:Y_Tools get_mem_info free=}=}
 
 {=var-set:boxmodel={=func:get_boxmodel=}=}
 
@@ -90,7 +90,7 @@ function getBuild(_version)
 function get_update_txt()
 {
         //show_waitbox(true);
-	loadSyncURL("/control/exec?Y_NI_Tools&get_update_txt");
+	loadSyncURL("/control/exec?Y_Tools&get_update_txt");
 	window.document.location.href="/Y_About_Image.yhtm?ani=false";
 }
 
@@ -270,7 +270,7 @@ jQuery(document).ready(function(){
 	</div>
 </div>
 <script>
-	loadSyncURL("/control/exec?Y_NI_Tools&rm_update_txt");
+	loadSyncURL("/control/exec?Y_Tools&rm_update_txt");
 </script>
 </body>
 </html>

data/y-web/Y_Baselib.js

@@ -554,12 +554,12 @@ function goPort(_port)
 	window.open(host + ":" + _port, "_blank");
 }
 
-function Y_NI_Tools(_cmd, _tout){
+function Y_Tools(_cmd, _tout){
 	var out = document.getElementById("out");
 	if (out)
 		out.innerHTML = "";
 	show_waitbox(true);
-	goUrl("/control/exec?Y_NI_Tools&" + _cmd);
+	goUrl("/control/exec?Y_Tools&" + _cmd);
 	if (typeof(_tout) == "undefined")
 		show_waitbox(false);
 	else

data/y-web/Y_Blocks.txt

@@ -489,7 +489,7 @@ start-block~netfs_local_dir
 end-block~netfs_local_dir
 
 start-block~netfs_is_mount
-{=var-set:is_mount_{=var-get:nr=}={=script:Y_NI_Tools is_mount {=if-equal:{=mount_type=}~1~/mnt/autofs/~=}{=var-get:local_dir_{=var-get:nr=}=}=}=}
+{=var-set:is_mount_{=var-get:nr=}={=script:Y_Tools is_mount {=if-equal:{=mount_type=}~1~/mnt/autofs/~=}{=var-get:local_dir_{=var-get:nr=}=}=}=}
 end-block~netfs_is_mount
 
 start-block~netfs_table_row
@@ -504,13 +504,13 @@ start-block~netfs_table_row
 				</a>
 				{=if-equal:{=mount_type=}~0~
 				{=if-equal:{=var-get:is_mount_{=var-get:nr=}=}~false~
-				<a href="javascript:Y_NI_Tools('do_mount {=var-get:local_dir_{=var-get:nr=}=}', 5000);" title="{=L:tools.netfs.mount=}">
+				<a href="javascript:Y_Tools('do_mount {=var-get:local_dir_{=var-get:nr=}=}', 5000);" title="{=L:tools.netfs.mount=}">
 					<img src="/images/server_add.png">
 				</a>
 				<img src="/images/blank.png">
 				~
 				<img src="/images/blank.png">
-				<a href="javascript:Y_NI_Tools('do_umount {=var-get:local_dir_{=var-get:nr=}=}', 5000);" title="{=L:tools.netfs.umount=}">
+				<a href="javascript:Y_Tools('do_umount {=var-get:local_dir_{=var-get:nr=}=}', 5000);" title="{=L:tools.netfs.umount=}">
 					<img src="/images/server_delete.png">
 				</a>
 				=}

data/y-web/Y_Boxcontrol_PZapit.yhtm

@@ -15,14 +15,14 @@
 			</tr>
 			<tr>
 				<td>
-					<input type="button" value="1080i" onclick='$("out").update(""); goUrl("/control/exec?Y_NI_Tools&amp;resolution&amp;1080");' />
+					<input type="button" value="1080i" onclick='$("out").update(""); goUrl("/control/exec?Y_Tools&amp;resolution&amp;1080");' />
-					<input type="button" value="720p"  onclick='$("out").update(""); goUrl("/control/exec?Y_NI_Tools&amp;resolution&amp;720");' />
+					<input type="button" value="720p"  onclick='$("out").update(""); goUrl("/control/exec?Y_Tools&amp;resolution&amp;720");' />
-					<input type="button" value="Pal"   onclick='$("out").update(""); goUrl("/control/exec?Y_NI_Tools&amp;resolution&amp;pal");' />
+					<input type="button" value="Pal"   onclick='$("out").update(""); goUrl("/control/exec?Y_Tools&amp;resolution&amp;pal");' />
 				</td>
 				<td>
-					<input type="button" value="Letterbox"           onclick='$("out").update(""); goUrl("/control/exec?Y_NI_Tools&amp;43mode&amp;1");' />
+					<input type="button" value="Letterbox"           onclick='$("out").update(""); goUrl("/control/exec?Y_Tools&amp;43mode&amp;1");' />
-					<input type="button" value="Pan &amp; Scan"      onclick='$("out").update(""); goUrl("/control/exec?Y_NI_Tools&amp;43mode&amp;2");' />
+					<input type="button" value="Pan &amp; Scan"      onclick='$("out").update(""); goUrl("/control/exec?Y_Tools&amp;43mode&amp;2");' />
-					<input type="button" value="14:9 Pan &amp; Scan" onclick='$("out").update(""); goUrl("/control/exec?Y_NI_Tools&amp;43mode&amp;3");' />
+					<input type="button" value="14:9 Pan &amp; Scan" onclick='$("out").update(""); goUrl("/control/exec?Y_Tools&amp;43mode&amp;3");' />
 				</td>
 			</tr>
 			<tr>
@@ -30,10 +30,10 @@
 				<td class="y_form_header" width="48%">{=L:bc.pzapit.tuner=}</td>
 			</tr>
 				<td>
-					<input type="button" value="{=L:reload=}" title="{=L:dblclick=}" ondblclick='$("out").update(""); goUrl("/control/exec?Y_NI_Tools&amp;reload_channellists");' />
+					<input type="button" value="{=L:reload=}" title="{=L:dblclick=}" ondblclick='$("out").update(""); goUrl("/control/exec?Y_Tools&amp;reload_channellists");' />
 				</td>
 				<td>
-					<input type="button" value="{=L:reset=}"  title="{=L:dblclick=}" ondblclick='$("out").update(""); goUrl("/control/exec?Y_NI_Tools&amp;reset_tuner");' />
+					<input type="button" value="{=L:reset=}"  title="{=L:dblclick=}" ondblclick='$("out").update(""); goUrl("/control/exec?Y_Tools&amp;reset_tuner");' />
 				</td>
 		</table>
 	</form>

data/y-web/Y_Settings_Camds.yhtm

@@ -1,24 +1,24 @@
-{=var-set:x_gbox={=script:Y_NI_Tools is_exec gbox=}=}
+{=var-set:x_gbox={=script:Y_Tools is_exec gbox=}=}
-{=var-set:x_oscam={=script:Y_NI_Tools is_exec oscam=}=}
+{=var-set:x_oscam={=script:Y_Tools is_exec oscam=}=}
-{=var-set:x_osmod={=script:Y_NI_Tools is_exec osmod=}=}
+{=var-set:x_osmod={=script:Y_Tools is_exec osmod=}=}
-{=var-set:x_ncam={=script:Y_NI_Tools is_exec ncam=}=}
+{=var-set:x_ncam={=script:Y_Tools is_exec ncam=}=}
-{=var-set:x_cccam={=script:Y_NI_Tools is_exec cccam=}=}
+{=var-set:x_cccam={=script:Y_Tools is_exec cccam=}=}
-{=var-set:x_doscam={=script:Y_NI_Tools is_exec doscam=}=}
+{=var-set:x_doscam={=script:Y_Tools is_exec doscam=}=}
-{=var-set:x_mgcamd={=script:Y_NI_Tools is_exec mgcamd=}=}
+{=var-set:x_mgcamd={=script:Y_Tools is_exec mgcamd=}=}
 
-{=var-set:r_gbox={=script:Y_NI_Tools is_running gbox=}=}
+{=var-set:r_gbox={=script:Y_Tools is_running gbox=}=}
-{=var-set:r_oscam={=script:Y_NI_Tools is_running oscam=}=}
+{=var-set:r_oscam={=script:Y_Tools is_running oscam=}=}
-{=var-set:r_osmod={=script:Y_NI_Tools is_running osmod=}=}
+{=var-set:r_osmod={=script:Y_Tools is_running osmod=}=}
-{=var-set:r_ncam={=script:Y_NI_Tools is_running ncam=}=}
+{=var-set:r_ncam={=script:Y_Tools is_running ncam=}=}
-{=var-set:r_cccam={=script:Y_NI_Tools is_running cccam=}=}
+{=var-set:r_cccam={=script:Y_Tools is_running cccam=}=}
-{=var-set:r_doscam={=script:Y_NI_Tools is_running doscam=}=}
+{=var-set:r_doscam={=script:Y_Tools is_running doscam=}=}
-{=var-set:r_mgcamd={=script:Y_NI_Tools is_running mgcamd=}=}
+{=var-set:r_mgcamd={=script:Y_Tools is_running mgcamd=}=}
 
-{=var-set:oscamport={=script:Y_NI_Tools get_oscam_webif_port=}=}
+{=var-set:oscamport={=script:Y_Tools get_oscam_webif_port=}=}
-{=var-set:osmodport={=script:Y_NI_Tools get_osmod_webif_port=}=}
+{=var-set:osmodport={=script:Y_Tools get_osmod_webif_port=}=}
-{=var-set:ncamport={=script:Y_NI_Tools get_ncam_webif_port=}=}
+{=var-set:ncamport={=script:Y_Tools get_ncam_webif_port=}=}
-{=var-set:cccamport={=script:Y_NI_Tools get_cccam_webif_port=}=}
+{=var-set:cccamport={=script:Y_Tools get_cccam_webif_port=}=}
-{=var-set:doscamport={=script:Y_NI_Tools get_doscam_webif_port=}=}
+{=var-set:doscamport={=script:Y_Tools get_doscam_webif_port=}=}
 
 {=include-block:Y_Blocks.txt;head=}
 <script src="/Y_Baselib.js"></script>
@@ -42,7 +42,7 @@ input[type="button"], .tools select {
 				<td class="y_form_header">&nbsp;</td>
 				<td class="y_form_header">&nbsp;</td>
 				<td class="y_form_header">
-					<input type="button" value="{=L:reset=}" title="{=L:reset=}" onclick='Y_NI_Tools("softcamreset", 10000);' />
+					<input type="button" value="{=L:reset=}" title="{=L:reset=}" onclick='Y_Tools("softcamreset", 10000);' />
 				</td>
 				<td class="y_form_header">&nbsp;</td>
 			</tr>
@@ -53,19 +53,19 @@ input[type="button"], .tools select {
 					{=var-get:camd=}
 				</td>
 				<td>
-					<span class="vinfo">{=script:Y_NI_Tools vinfo {=var-get:camd=}=}</span>
+					<span class="vinfo">{=script:Y_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:stop=}"  title="{=L:stop=} {=var-get:camd=}"  onclick='Y_NI_Tools("{=var-get:camd=}stop", 10000);' />
+					<input type="button" value="{=L:stop=}"  title="{=L:stop=} {=var-get:camd=}"  onclick='Y_Tools("{=var-get:camd=}stop", 10000);' />
 				</td>
 				<td>	
-					<input type="button" value="{=L:reset=}" title="{=L:reset=} {=var-get:camd=}" onclick='Y_NI_Tools("{=var-get:camd=}reset", 10000);' />
+					<input type="button" value="{=L:reset=}" title="{=L:reset=} {=var-get:camd=}" onclick='Y_Tools("{=var-get:camd=}reset", 10000);' />
 				</td>
 				~
 				<td>
-					<input type="button" value="{=L:start=}" title="{=L:start=} {=var-get:camd=}" onclick='Y_NI_Tools("{=var-get:camd=}start", 10000);' />
+					<input type="button" value="{=L:start=}" title="{=L:start=} {=var-get:camd=}" onclick='Y_Tools("{=var-get:camd=}start", 10000);' />
 				</td>
 				<td>
 				</td>
@@ -119,25 +119,25 @@ input[type="button"], .tools select {
 						</option>
 						{=if-equal:{=var-get:r_{=var-get:camd=}=}~true~
 						<option> {=L:set.camd-tools.line=} </option>
-						<option onclick='Y_NI_Tools("ecminfo");'>
+						<option onclick='Y_Tools("ecminfo");'>
 							{=L:set.camd-tools.ecminfo=}
 						</option>
-						<option onclick='Y_NI_Tools("pidinfo");'>
+						<option onclick='Y_Tools("pidinfo");'>
 							{=L:set.camd-tools.pidinfo=}
 						</option>
-						<option onclick='Y_NI_Tools("sc01info");'>
+						<option onclick='Y_Tools("sc01info");'>
 							{=L:set.camd-tools.sc01info=}
 						</option>
-						<option onclick='Y_NI_Tools("sc02info");'>
+						<option onclick='Y_Tools("sc02info");'>
 							{=L:set.camd-tools.sc02info=}
 						</option>
-						<option onclick='Y_NI_Tools("shareinfo");'>
+						<option onclick='Y_Tools("shareinfo");'>
 							{=L:set.camd-tools.shareinfo=}
 						</option>
-						<option onclick='Y_NI_Tools("shareonl");'>
+						<option onclick='Y_Tools("shareonl");'>
 							{=L:set.camd-tools.shareonl=}
 						</option>
-						<option onclick='Y_NI_Tools("countcards&amp;/tmp/share.info");'>
+						<option onclick='Y_Tools("countcards&amp;/tmp/share.info");'>
 							{=L:set.camd-tools.countcards=}
 						</option>
 						~
@@ -157,19 +157,19 @@ input[type="button"], .tools select {
 					=}
 				</td>
 				<td>
-					<span class="vinfo">{=script:Y_NI_Tools vinfo {=var-get:camd=}=}</span>
+					<span class="vinfo">{=script:Y_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:stop=}"  title="{=L:stop=} {=var-get:camd=}"  onclick='Y_NI_Tools("{=var-get:camd=}stop", 10000);' />
+					<input type="button" value="{=L:stop=}"  title="{=L:stop=} {=var-get:camd=}"  onclick='Y_Tools("{=var-get:camd=}stop", 10000);' />
 				</td>
 				<td>	
-					<input type="button" value="{=L:reset=}" title="{=L:reset=} {=var-get:camd=}" onclick='Y_NI_Tools("{=var-get:camd=}reset", 10000);' />
+					<input type="button" value="{=L:reset=}" title="{=L:reset=} {=var-get:camd=}" onclick='Y_Tools("{=var-get:camd=}reset", 10000);' />
 				</td>
 				~
 				<td>
-					<input type="button" value="{=L:start=}" title="{=L:start=} {=var-get:camd=}" onclick='Y_NI_Tools("{=var-get:camd=}start", 10000);' />
+					<input type="button" value="{=L:start=}" title="{=L:start=} {=var-get:camd=}" onclick='Y_Tools("{=var-get:camd=}start", 10000);' />
 				</td>
 				<td>
 				</td>
@@ -205,10 +205,10 @@ input[type="button"], .tools select {
 						</option>
 						{=if-equal:{=var-get:r_{=var-get:camd=}=}~true~
 						<option> {=L:set.camd-tools.line=} </option>
-						<option onclick='Y_NI_Tools("ecminfo");'>
+						<option onclick='Y_Tools("ecminfo");'>
 							{=L:set.camd-tools.ecminfo=}
 						</option>
-						<option onclick='Y_NI_Tools("oscamversion");'>
+						<option onclick='Y_Tools("oscamversion");'>
 							{=L:set.camd-tools.oscamversion=}
 						</option>
 						~
@@ -228,19 +228,19 @@ input[type="button"], .tools select {
 					=}
 				</td>
 				<td>
-					<span class="vinfo">{=script:Y_NI_Tools vinfo {=var-get:camd=}=}</span>
+					<span class="vinfo">{=script:Y_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:stop=}"  title="{=L:stop=} {=var-get:camd=}"  onclick='Y_NI_Tools("{=var-get:camd=}stop", 10000);' />
+					<input type="button" value="{=L:stop=}"  title="{=L:stop=} {=var-get:camd=}"  onclick='Y_Tools("{=var-get:camd=}stop", 10000);' />
 				</td>
 				<td>
-					<input type="button" value="{=L:reset=}" title="{=L:reset=} {=var-get:camd=}" onclick='Y_NI_Tools("{=var-get:camd=}reset", 10000);' />
+					<input type="button" value="{=L:reset=}" title="{=L:reset=} {=var-get:camd=}" onclick='Y_Tools("{=var-get:camd=}reset", 10000);' />
 				</td>
 				~
 				<td>
-					<input type="button" value="{=L:start=}" title="{=L:start=} {=var-get:camd=}" onclick='Y_NI_Tools("{=var-get:camd=}start", 10000);' />
+					<input type="button" value="{=L:start=}" title="{=L:start=} {=var-get:camd=}" onclick='Y_Tools("{=var-get:camd=}start", 10000);' />
 				</td>
 				<td>
 				</td>
@@ -276,10 +276,10 @@ input[type="button"], .tools select {
 						</option>
 						{=if-equal:{=var-get:r_{=var-get:camd=}=}~true~
 						<option> {=L:set.camd-tools.line=} </option>
-						<option onclick='Y_NI_Tools("ecminfo");'>
+						<option onclick='Y_Tools("ecminfo");'>
 							{=L:set.camd-tools.ecminfo=}
 						</option>
-						<option onclick='Y_NI_Tools("oscamversion");'>
+						<option onclick='Y_Tools("oscamversion");'>
 							{=L:set.camd-tools.oscamversion=}
 						</option>
 						~
@@ -299,19 +299,19 @@ input[type="button"], .tools select {
 					=}
 				</td>
 				<td>
-					<span class="vinfo">{=script:Y_NI_Tools vinfo {=var-get:camd=}=}</span>
+					<span class="vinfo">{=script:Y_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:stop=}"  title="{=L:stop=} {=var-get:camd=}"  onclick='Y_NI_Tools("{=var-get:camd=}stop", 10000);' />
+					<input type="button" value="{=L:stop=}"  title="{=L:stop=} {=var-get:camd=}"  onclick='Y_Tools("{=var-get:camd=}stop", 10000);' />
 				</td>
 				<td>
-					<input type="button" value="{=L:reset=}" title="{=L:reset=} {=var-get:camd=}" onclick='Y_NI_Tools("{=var-get:camd=}reset", 10000);' />
+					<input type="button" value="{=L:reset=}" title="{=L:reset=} {=var-get:camd=}" onclick='Y_Tools("{=var-get:camd=}reset", 10000);' />
 				</td>
 				~
 				<td>
-					<input type="button" value="{=L:start=}" title="{=L:start=} {=var-get:camd=}" onclick='Y_NI_Tools("{=var-get:camd=}start", 10000);' />
+					<input type="button" value="{=L:start=}" title="{=L:start=} {=var-get:camd=}" onclick='Y_Tools("{=var-get:camd=}start", 10000);' />
 				</td>
 				<td>
 				</td>
@@ -347,10 +347,10 @@ input[type="button"], .tools select {
 						</option>
 						{=if-equal:{=var-get:r_{=var-get:camd=}=}~true~
 						<option> {=L:set.camd-tools.line=} </option>
-						<option onclick='Y_NI_Tools("ecminfo");'>
+						<option onclick='Y_Tools("ecminfo");'>
 							{=L:set.camd-tools.ecminfo=}
 						</option>
-						<option onclick='Y_NI_Tools("ncamversion");'>
+						<option onclick='Y_Tools("ncamversion");'>
 							{=L:set.camd-tools.ncamversion=}
 						</option>
 						~
@@ -370,19 +370,19 @@ input[type="button"], .tools select {
 					=}
 				</td>
 				<td>
-					<span class="vinfo">{=script:Y_NI_Tools vinfo {=var-get:camd=}=}</span>
+					<span class="vinfo">{=script:Y_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:stop=}"  title="{=L:stop=} {=var-get:camd=}"  onclick='Y_NI_Tools("{=var-get:camd=}stop", 10000);' />
+					<input type="button" value="{=L:stop=}"  title="{=L:stop=} {=var-get:camd=}"  onclick='Y_Tools("{=var-get:camd=}stop", 10000);' />
 				</td>
 				<td>
-					<input type="button" value="{=L:reset=}" title="{=L:reset=} {=var-get:camd=}" onclick='Y_NI_Tools("{=var-get:camd=}reset", 10000);' />
+					<input type="button" value="{=L:reset=}" title="{=L:reset=} {=var-get:camd=}" onclick='Y_Tools("{=var-get:camd=}reset", 10000);' />
 				</td>
 				~
 				<td>
-					<input type="button" value="{=L:start=}" title="{=L:start=} {=var-get:camd=}" onclick='Y_NI_Tools("{=var-get:camd=}start", 10000);' />
+					<input type="button" value="{=L:start=}" title="{=L:start=} {=var-get:camd=}" onclick='Y_Tools("{=var-get:camd=}start", 10000);' />
 				</td>
 				<td>
 				</td>
@@ -412,10 +412,10 @@ input[type="button"], .tools select {
 						</option>
 						{=if-equal:{=var-get:r_{=var-get:camd=}=}~true~
 						<option> {=L:set.camd-tools.line=} </option>
-						<option onclick='Y_NI_Tools("ecminfo");'>
+						<option onclick='Y_Tools("ecminfo");'>
 							{=L:set.camd-tools.ecminfo=}
 						</option>
-						<option onclick='Y_NI_Tools("cccamversion");'>
+						<option onclick='Y_Tools("cccamversion");'>
 							{=L:set.camd-tools.cccamversion=}
 						</option>
 						~
@@ -435,19 +435,19 @@ input[type="button"], .tools select {
 					=}
 				</td>
 				<td>
-					<span class="vinfo">{=script:Y_NI_Tools vinfo {=var-get:camd=}=}</span>
+					<span class="vinfo">{=script:Y_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:stop=}"  title="{=L:stop=} {=var-get:camd=}"  onclick='Y_NI_Tools("{=var-get:camd=}stop", 10000);' />
+					<input type="button" value="{=L:stop=}"  title="{=L:stop=} {=var-get:camd=}"  onclick='Y_Tools("{=var-get:camd=}stop", 10000);' />
 				</td>
 				<td>
-					<input type="button" value="{=L:reset=}" title="{=L:reset=} {=var-get:camd=}" onclick='Y_NI_Tools("{=var-get:camd=}reset", 10000);' />
+					<input type="button" value="{=L:reset=}" title="{=L:reset=} {=var-get:camd=}" onclick='Y_Tools("{=var-get:camd=}reset", 10000);' />
 				</td>
 				~
 				<td>
-					<input type="button" value="{=L:start=}" title="{=L:start=} {=var-get:camd=}" onclick='Y_NI_Tools("{=var-get:camd=}start", 10000);' />
+					<input type="button" value="{=L:start=}" title="{=L:start=} {=var-get:camd=}" onclick='Y_Tools("{=var-get:camd=}start", 10000);' />
 				</td>
 				<td>
 				</td>
@@ -492,10 +492,10 @@ input[type="button"], .tools select {
 						</option>
 						{=if-equal:{=var-get:r_{=var-get:camd=}=}~true~
 						<option> {=L:set.camd-tools.line=} </option>
-						<option onclick='Y_NI_Tools("ecminfo");'>
+						<option onclick='Y_Tools("ecminfo");'>
 							{=L:set.camd-tools.ecminfo=}
 						</option>
-						<option onclick='Y_NI_Tools("doscamversion");'>
+						<option onclick='Y_Tools("doscamversion");'>
 							{=L:set.camd-tools.doscamversion=}
 						</option>
 						~
@@ -511,19 +511,19 @@ input[type="button"], .tools select {
 					{=var-get:camd=}
 				</td>
 				<td>
-					<span class="vinfo">{=script:Y_NI_Tools vinfo {=var-get:camd=}=}</span>
+					<span class="vinfo">{=script:Y_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:stop=}"  title="{=L:stop=} {=var-get:camd=}"  onclick='Y_NI_Tools("{=var-get:camd=}stop", 10000);' /> 
+					<input type="button" value="{=L:stop=}"  title="{=L:stop=} {=var-get:camd=}"  onclick='Y_Tools("{=var-get:camd=}stop", 10000);' />
 				</td>                                                                                                                                               
 				<td>	                                                                                                                                            
-					<input type="button" value="{=L:reset=}" title="{=L:reset=} {=var-get:camd=}" onclick='Y_NI_Tools("{=var-get:camd=}reset", 10000);' />
+					<input type="button" value="{=L:reset=}" title="{=L:reset=} {=var-get:camd=}" onclick='Y_Tools("{=var-get:camd=}reset", 10000);' />
 				</td>                                                                                                                                               
 				~                                                                                                                                                   
 				<td>                                                                                                                                                
-					<input type="button" value="{=L:start=}" title="{=L:start=} {=var-get:camd=}" onclick='Y_NI_Tools("{=var-get:camd=}start", 10000);' />
+					<input type="button" value="{=L:start=}" title="{=L:start=} {=var-get:camd=}" onclick='Y_Tools("{=var-get:camd=}start", 10000);' />
 				</td>
 				<td>
 				</td>
@@ -568,22 +568,22 @@ input[type="button"], .tools select {
 						</option>
 						{=if-equal:{=var-get:r_{=var-get:camd=}=}~true~
 						<option> {=L:set.camd-tools.line=} </option>
-						<option onclick='Y_NI_Tools("ecminfo");'>
+						<option onclick='Y_Tools("ecminfo");'>
 							{=L:set.camd-tools.ecminfo=}
 						</option>
-						<option onclick='Y_NI_Tools("pidinfo");'>
+						<option onclick='Y_Tools("pidinfo");'>
 							{=L:set.camd-tools.pidinfo=}
 						</option>
-						<option onclick='Y_NI_Tools("mginfo");'>
+						<option onclick='Y_Tools("mginfo");'>
 							{=L:set.camd-tools.mginfo=}
 						</option>
-						<option onclick='Y_NI_Tools("cccamdinfo");'>
+						<option onclick='Y_Tools("cccamdinfo");'>
 							{=L:set.camd-tools.cccamdinfo=}
 						</option>
-						<option onclick='Y_NI_Tools("mgshareinfo");'>
+						<option onclick='Y_Tools("mgshareinfo");'>
 							{=L:set.camd-tools.mgshareinfo=}
 						</option>
-						<option onclick='Y_NI_Tools("countcards /tmp/mg.info");'>
+						<option onclick='Y_Tools("countcards /tmp/mg.info");'>
 							{=L:set.camd-tools.countcards=}
 						</option>
 						~

data/y-web/Y_Settings_Infoicons.yhtm

@@ -59,8 +59,8 @@ function do_submit()
 					{=L:set.infoicons.flagfiles=}
 				</td>
 				<td class="y_form_header">
-					<input type="button" value="{=L:remove=}" onclick='Y_NI_Tools("rm_icons_flag    {=var-get:icons_flag0=} {=var-get:icons_flag1=} {=var-get:icons_flag2=} {=var-get:icons_flag3=} {=var-get:icons_flag4=} {=var-get:icons_flag5=} {=var-get:icons_flag6=} {=var-get:icons_flag7=}", 1500);' />
+					<input type="button" value="{=L:remove=}" onclick='Y_Tools("rm_icons_flag    {=var-get:icons_flag0=} {=var-get:icons_flag1=} {=var-get:icons_flag2=} {=var-get:icons_flag3=} {=var-get:icons_flag4=} {=var-get:icons_flag5=} {=var-get:icons_flag6=} {=var-get:icons_flag7=}", 1500);' />
-					<input type="button" value="{=L:create=}" onclick='Y_NI_Tools("touch_icons_flag {=var-get:icons_flag0=} {=var-get:icons_flag1=} {=var-get:icons_flag2=} {=var-get:icons_flag3=} {=var-get:icons_flag4=} {=var-get:icons_flag5=} {=var-get:icons_flag6=} {=var-get:icons_flag7=}", 1500);' />
+					<input type="button" value="{=L:create=}" onclick='Y_Tools("touch_icons_flag {=var-get:icons_flag0=} {=var-get:icons_flag1=} {=var-get:icons_flag2=} {=var-get:icons_flag3=} {=var-get:icons_flag4=} {=var-get:icons_flag5=} {=var-get:icons_flag6=} {=var-get:icons_flag7=}", 1500);' />
 				</td>
 			</tr>
 			{=var-set:nr=0=}
@@ -68,7 +68,7 @@ function do_submit()
 				<td>
 				{=if-file-exists:{=var-get:icons_flag{=var-get:nr=}=}~
 					{=if-file-exists:{=var-get:icons_dir=}/info{=var-get:nr=}_on.png~
-					<img src="{=var-get:icons_dir=}/info{=var-get:nr=}_on.png" title="{=script:Y_NI_Tools read_icons_flag {=var-get:icons_flag{=var-get:nr=}=}=} new mail(s)"/>
+					<img src="{=var-get:icons_dir=}/info{=var-get:nr=}_on.png" title="{=script:Y_Tools read_icons_flag {=var-get:icons_flag{=var-get:nr=}=}=} new mail(s)"/>
 					~ 
 					=}
 				~
@@ -82,8 +82,8 @@ function do_submit()
 					<input type="text" name="mode_icons_flag{=var-get:nr=}" size="30" value="{=var-get:icons_flag{=var-get:nr=}=}" title=""/>
 				</td>
 				<td>
-					<input type="button" value="{=L:remove=}" onclick='Y_NI_Tools("rm_icons_flag    {=var-get:icons_flag{=var-get:nr=}=}", 500);' />
+					<input type="button" value="{=L:remove=}" onclick='Y_Tools("rm_icons_flag    {=var-get:icons_flag{=var-get:nr=}=}", 500);' />
-					<input type="button" value="{=L:create=}" onclick='Y_NI_Tools("touch_icons_flag {=var-get:icons_flag{=var-get:nr=}=}", 500);' />
+					<input type="button" value="{=L:create=}" onclick='Y_Tools("touch_icons_flag {=var-get:icons_flag{=var-get:nr=}=}", 500);' />
 				</td>
 			</tr>
 			{=var-set:nr=1=}
@@ -105,8 +105,8 @@ function do_submit()
 					<input type="text" name="mode_icons_flag{=var-get:nr=}" size="30" value="{=var-get:icons_flag{=var-get:nr=}=}" title=""/>
 				</td>
 				<td>
-					<input type="button" value="{=L:remove=}" onclick='Y_NI_Tools("rm_icons_flag    {=var-get:icons_flag{=var-get:nr=}=}", 500);' />
+					<input type="button" value="{=L:remove=}" onclick='Y_Tools("rm_icons_flag    {=var-get:icons_flag{=var-get:nr=}=}", 500);' />
-					<input type="button" value="{=L:create=}" onclick='Y_NI_Tools("touch_icons_flag {=var-get:icons_flag{=var-get:nr=}=}", 500);' />
+					<input type="button" value="{=L:create=}" onclick='Y_Tools("touch_icons_flag {=var-get:icons_flag{=var-get:nr=}=}", 500);' />
 				</td>
 			</tr>
 			{=var-set:nr=2=}
@@ -128,8 +128,8 @@ function do_submit()
 					<input type="text" name="mode_icons_flag{=var-get:nr=}" size="30" value="{=var-get:icons_flag{=var-get:nr=}=}" title=""/>
 				</td>
 				<td>
-					<input type="button" value="{=L:remove=}" onclick='Y_NI_Tools("rm_icons_flag    {=var-get:icons_flag{=var-get:nr=}=}", 500);' />
+					<input type="button" value="{=L:remove=}" onclick='Y_Tools("rm_icons_flag    {=var-get:icons_flag{=var-get:nr=}=}", 500);' />
-					<input type="button" value="{=L:create=}" onclick='Y_NI_Tools("touch_icons_flag {=var-get:icons_flag{=var-get:nr=}=}", 500);' />
+					<input type="button" value="{=L:create=}" onclick='Y_Tools("touch_icons_flag {=var-get:icons_flag{=var-get:nr=}=}", 500);' />
 				</td>
 			</tr>
 			{=var-set:nr=3=}
@@ -151,8 +151,8 @@ function do_submit()
 					<input type="text" name="mode_icons_flag{=var-get:nr=}" size="30" value="{=var-get:icons_flag{=var-get:nr=}=}" title=""/>
 				</td>
 				<td>
-					<input type="button" value="{=L:remove=}" onclick='Y_NI_Tools("rm_icons_flag    {=var-get:icons_flag{=var-get:nr=}=}", 500);' />
+					<input type="button" value="{=L:remove=}" onclick='Y_Tools("rm_icons_flag    {=var-get:icons_flag{=var-get:nr=}=}", 500);' />
-					<input type="button" value="{=L:create=}" onclick='Y_NI_Tools("touch_icons_flag {=var-get:icons_flag{=var-get:nr=}=}", 500);' />
+					<input type="button" value="{=L:create=}" onclick='Y_Tools("touch_icons_flag {=var-get:icons_flag{=var-get:nr=}=}", 500);' />
 				</td>
 			</tr>
 			{=var-set:nr=4=}
@@ -174,8 +174,8 @@ function do_submit()
 					<input type="text" name="mode_icons_flag{=var-get:nr=}" size="30" value="{=var-get:icons_flag{=var-get:nr=}=}" title=""/>
 				</td>
 				<td>
-					<input type="button" value="{=L:remove=}" onclick='Y_NI_Tools("rm_icons_flag    {=var-get:icons_flag{=var-get:nr=}=}", 500);' />
+					<input type="button" value="{=L:remove=}" onclick='Y_Tools("rm_icons_flag    {=var-get:icons_flag{=var-get:nr=}=}", 500);' />
-					<input type="button" value="{=L:create=}" onclick='Y_NI_Tools("touch_icons_flag {=var-get:icons_flag{=var-get:nr=}=}", 500);' />
+					<input type="button" value="{=L:create=}" onclick='Y_Tools("touch_icons_flag {=var-get:icons_flag{=var-get:nr=}=}", 500);' />
 				</td>
 			</tr>
 			{=var-set:nr=5=}
@@ -197,8 +197,8 @@ function do_submit()
 					<input type="text" name="mode_icons_flag{=var-get:nr=}" size="30" value="{=var-get:icons_flag{=var-get:nr=}=}" title=""/>
 				</td>
 				<td>
-					<input type="button" value="{=L:remove=}" onclick='Y_NI_Tools("rm_icons_flag    {=var-get:icons_flag{=var-get:nr=}=}", 500);' />
+					<input type="button" value="{=L:remove=}" onclick='Y_Tools("rm_icons_flag    {=var-get:icons_flag{=var-get:nr=}=}", 500);' />
-					<input type="button" value="{=L:create=}" onclick='Y_NI_Tools("touch_icons_flag {=var-get:icons_flag{=var-get:nr=}=}", 500);' />
+					<input type="button" value="{=L:create=}" onclick='Y_Tools("touch_icons_flag {=var-get:icons_flag{=var-get:nr=}=}", 500);' />
 				</td>
 			</tr>
 			{=var-set:nr=6=}
@@ -220,8 +220,8 @@ function do_submit()
 					<input type="text" name="mode_icons_flag{=var-get:nr=}" size="30" value="{=var-get:icons_flag{=var-get:nr=}=}" title=""/>
 				</td>
 				<td>
-					<input type="button" value="{=L:remove=}" onclick='Y_NI_Tools("rm_icons_flag    {=var-get:icons_flag{=var-get:nr=}=}", 500);' />
+					<input type="button" value="{=L:remove=}" onclick='Y_Tools("rm_icons_flag    {=var-get:icons_flag{=var-get:nr=}=}", 500);' />
-					<input type="button" value="{=L:create=}" onclick='Y_NI_Tools("touch_icons_flag {=var-get:icons_flag{=var-get:nr=}=}", 500);' />
+					<input type="button" value="{=L:create=}" onclick='Y_Tools("touch_icons_flag {=var-get:icons_flag{=var-get:nr=}=}", 500);' />
 				</td>
 			</tr>
 			{=var-set:nr=7=}
@@ -243,8 +243,8 @@ function do_submit()
 					<input type="text" name="mode_icons_flag{=var-get:nr=}" size="30" value="{=var-get:icons_flag{=var-get:nr=}=}" title=""/>
 				</td>
 				<td>
-					<input type="button" value="{=L:remove=}" onclick='Y_NI_Tools("rm_icons_flag    {=var-get:icons_flag{=var-get:nr=}=}", 500);' />
+					<input type="button" value="{=L:remove=}" onclick='Y_Tools("rm_icons_flag    {=var-get:icons_flag{=var-get:nr=}=}", 500);' />
-					<input type="button" value="{=L:create=}" onclick='Y_NI_Tools("touch_icons_flag {=var-get:icons_flag{=var-get:nr=}=}", 500);' />
+					<input type="button" value="{=L:create=}" onclick='Y_Tools("touch_icons_flag {=var-get:icons_flag{=var-get:nr=}=}", 500);' />
 				</td>
 			</tr>
 		</table>

data/y-web/Y_Settings_Plugins.yhtm

@@ -1,8 +1,8 @@
-{=var-set:r_minidlnad={=script:Y_NI_Tools is_running minidlnad=}=}
+{=var-set:r_minidlnad={=script:Y_Tools is_running minidlnad=}=}
-{=var-set:minidlnadport={=script:Y_NI_Tools get_minidlnad_webif_port=}=}
+{=var-set:minidlnadport={=script:Y_Tools get_minidlnad_webif_port=}=}
 
-{=var-set:r_xupnpd={=script:Y_NI_Tools is_running xupnpd=}=}
+{=var-set:r_xupnpd={=script:Y_Tools is_running xupnpd=}=}
-{=var-set:xupnpdport={=script:Y_NI_Tools get_xupnpd_webif_port=}=}
+{=var-set:xupnpdport={=script:Y_Tools get_xupnpd_webif_port=}=}
 
 {=include-block:Y_Blocks.txt;head=}
 <script src="/Y_Baselib.js"></script>
@@ -29,9 +29,9 @@
 				</td>
 				<td>
 					{=if-file-exists:/var/etc/.fritzcallmonitor~
-					<input type="button" value="{=L:stop=}" onclick='Y_NI_Tools("p_fcm_stop", 5000);'/>
+					<input type="button" value="{=L:stop=}" onclick='Y_Tools("p_fcm_stop", 5000);'/>
 					~
-					<input type="button" value="{=L:start=}" onclick='Y_NI_Tools("p_fcm_start", 5000);'/>
+					<input type="button" value="{=L:start=}" onclick='Y_Tools("p_fcm_start", 5000);'/>
 					=}
 				</td>
 				<td>
@@ -49,9 +49,9 @@
 				</td>
 				<td>
 					{=if-file-exists:/var/etc/.nfsd~
-					<input type="button" value="{=L:stop=}" onclick='Y_NI_Tools("p_nfs_stop", 5000);'/>
+					<input type="button" value="{=L:stop=}" onclick='Y_Tools("p_nfs_stop", 5000);'/>
 					~
-					<input type="button" value="{=L:start=}" onclick='Y_NI_Tools("p_nfs_start", 5000);'/>
+					<input type="button" value="{=L:start=}" onclick='Y_Tools("p_nfs_start", 5000);'/>
 					=}
 				</td>
 				<td>
@@ -68,9 +68,9 @@
 				</td>
 				<td>
 					{=if-file-exists:/var/etc/.samba~
-					<input type="button" value="{=L:stop=}" onclick='Y_NI_Tools("p_samba_stop", 5000);'/>
+					<input type="button" value="{=L:stop=}" onclick='Y_Tools("p_samba_stop", 5000);'/>
 					~
-					<input type="button" value="{=L:start=}" onclick='Y_NI_Tools("p_samba_start", 5000);'/>
+					<input type="button" value="{=L:start=}" onclick='Y_Tools("p_samba_start", 5000);'/>
 					=}
 				</td>
 				<td>
@@ -87,9 +87,9 @@
 				</td>
 				<td>
 					{=if-file-exists:/var/etc/.tuxcald~
-					<input type="button" value="{=L:stop=}" onclick='Y_NI_Tools("p_tuxcald_stop", 5000);'/>
+					<input type="button" value="{=L:stop=}" onclick='Y_Tools("p_tuxcald_stop", 5000);'/>
 					~
-					<input type="button" value="{=L:start=}" onclick='Y_NI_Tools("p_tuxcald_start", 5000);'/>
+					<input type="button" value="{=L:start=}" onclick='Y_Tools("p_tuxcald_start", 5000);'/>
 					=}
 				</td>
 				<td>
@@ -106,9 +106,9 @@
 				</td>
 				<td>
 					{=if-file-exists:/var/etc/.tuxmaild~
-					<input type="button" value="{=L:stop=}" onclick='Y_NI_Tools("p_tuxmaild_stop", 5000);'/>
+					<input type="button" value="{=L:stop=}" onclick='Y_Tools("p_tuxmaild_stop", 5000);'/>
 					~
-					<input type="button" value="{=L:start=}" onclick='Y_NI_Tools("p_tuxmaild_start", 5000);'/>
+					<input type="button" value="{=L:start=}" onclick='Y_Tools("p_tuxmaild_start", 5000);'/>
 					=}
 				</td>
 				<td>
@@ -125,9 +125,9 @@
 				</td>
 				<td>
 					{=if-file-exists:/var/etc/.inadyn~
-					<input type="button" value="{=L:stop=}" onclick='Y_NI_Tools("p_inadyn_stop", 5000);'/>
+					<input type="button" value="{=L:stop=}" onclick='Y_Tools("p_inadyn_stop", 5000);'/>
 					~
-					<input type="button" value="{=L:start=}" onclick='Y_NI_Tools("p_inadyn_start", 5000);'/>
+					<input type="button" value="{=L:start=}" onclick='Y_Tools("p_inadyn_start", 5000);'/>
 					=}
 				</td>
 				<td>
@@ -144,9 +144,9 @@
 				</td>
 				<td>
 					{=if-file-exists:/var/etc/.dropbear~
-					<input type="button" value="{=L:stop=}" onclick='Y_NI_Tools("p_dropbear_stop", 5000);'/>
+					<input type="button" value="{=L:stop=}" onclick='Y_Tools("p_dropbear_stop", 5000);'/>
 					~
-					<input type="button" value="{=L:start=}" onclick='Y_NI_Tools("p_dropbear_start", 5000);'/>
+					<input type="button" value="{=L:start=}" onclick='Y_Tools("p_dropbear_start", 5000);'/>
 					=}
 				</td>
 				<td>
@@ -163,9 +163,9 @@
 				</td>
 				<td>
 					{=if-file-exists:/var/etc/.ushare~
-					<input type="button" value="{=L:stop=}" onclick='Y_NI_Tools("p_ushare_stop", 5000);'/>
+					<input type="button" value="{=L:stop=}" onclick='Y_Tools("p_ushare_stop", 5000);'/>
 					~
-					<input type="button" value="{=L:start=}" onclick='Y_NI_Tools("p_ushare_start", 5000);'/>
+					<input type="button" value="{=L:start=}" onclick='Y_Tools("p_ushare_start", 5000);'/>
 					=}
 				</td>
 				<td>
@@ -182,9 +182,9 @@
 				</td>
 				<td>
 					{=if-file-exists:/var/etc/.minidlnad~
-					<input type="button" value="{=L:stop=}" onclick='Y_NI_Tools("p_minidlna_stop", 5000);'/>
+					<input type="button" value="{=L:stop=}" onclick='Y_Tools("p_minidlna_stop", 5000);'/>
 					~
-					<input type="button" value="{=L:start=}" onclick='Y_NI_Tools("p_minidlna_start", 5000);'/>
+					<input type="button" value="{=L:start=}" onclick='Y_Tools("p_minidlna_start", 5000);'/>
 					=}
 				</td>
 				<td>
@@ -205,9 +205,9 @@
 				</td>
 				<td>
 					{=if-file-exists:/var/etc/.djmount~
-					<input type="button" value="{=L:stop=}" onclick='Y_NI_Tools("p_djmount_stop", 5000);'/>
+					<input type="button" value="{=L:stop=}" onclick='Y_Tools("p_djmount_stop", 5000);'/>
 					~
-					<input type="button" value="{=L:start=}" onclick='Y_NI_Tools("p_djmount_start", 5000);'/>
+					<input type="button" value="{=L:start=}" onclick='Y_Tools("p_djmount_start", 5000);'/>
 					=}
 				</td>
 				<td>
@@ -224,9 +224,9 @@
 				</td>
 				<td>
 					{=if-file-exists:/var/etc/.xupnpd~
-					<input type="button" value="{=L:stop=}" onclick='Y_NI_Tools("p_xupnpd_stop", 5000);'/>
+					<input type="button" value="{=L:stop=}" onclick='Y_Tools("p_xupnpd_stop", 5000);'/>
 					~
-					<input type="button" value="{=L:start=}" onclick='Y_NI_Tools("p_xupnpd_start", 5000);'/>
+					<input type="button" value="{=L:start=}" onclick='Y_Tools("p_xupnpd_start", 5000);'/>
 					=}
 				</td>
 				<td>
@@ -247,9 +247,9 @@
 				</td>
 				<td>
 					{=if-file-exists:/var/etc/.crond~
-					<input type="button" value="{=L:stop=}" onclick='Y_NI_Tools("p_crond_stop", 5000);'/>
+					<input type="button" value="{=L:stop=}" onclick='Y_Tools("p_crond_stop", 5000);'/>
 					~
-					<input type="button" value="{=L:start=}" onclick='Y_NI_Tools("p_crond_start", 5000);'/>
+					<input type="button" value="{=L:start=}" onclick='Y_Tools("p_crond_start", 5000);'/>
 					=}
 				</td>
 				<td>

data/y-web/Y_Settings_Plugins_hide.yhtm

@@ -1,6 +1,6 @@
-{=var-set:_p_list_so={=script:Y_NI_Tools p_list so=}=}
+{=var-set:_p_list_so={=script:Y_Tools p_list so=}=}
-{=var-set:_p_list_sh={=script:Y_NI_Tools p_list sh=}=}
+{=var-set:_p_list_sh={=script:Y_Tools p_list sh=}=}
-{=var-set:_p_list_lua={=script:Y_NI_Tools p_list lua=}=}
+{=var-set:_p_list_lua={=script:Y_Tools p_list lua=}=}
 
 {=include-block:Y_Blocks.txt;head=}
 <script src="/Y_Baselib.js"></script>

data/y-web/Y_Tools_NetFS.yhtm

@@ -72,16 +72,16 @@ function do_submit()
 					<img src="/images/modify.png">
 				</a>
 				{=if-equal:{=mount_type=}~0~
-				<a href="javascript:Y_NI_Tools('do_mount_all', 5000);" title="{=L:tools.netfs.mount_all=}">
+				<a href="javascript:Y_Tools('do_mount_all', 5000);" title="{=L:tools.netfs.mount_all=}">
 					<img src="/images/server_add.png">
 				</a>
-				<a href="javascript:Y_NI_Tools('do_umount_all', 5000);" title="{=L:tools.netfs.umount_all=}">
+				<a href="javascript:Y_Tools('do_umount_all', 5000);" title="{=L:tools.netfs.umount_all=}">
 					<img src="/images/server_delete.png">
 				</a>
 				~
 				=}
 				{=if-equal:{=mount_type=}~1~
-				<a href="javascript:Y_NI_Tools('do_autofs restart', 5000);" title="{=L:tools.netfs.autofs_restart=}">
+				<a href="javascript:Y_Tools('do_autofs restart', 5000);" title="{=L:tools.netfs.autofs_restart=}">
 					<img src="/images/server_link.png">
 				</a>
 				~
@@ -100,7 +100,7 @@ function do_submit()
 	<br />
 	<button type="button" ytype="save" title="{=L:save=}: {=L:tools.netfs.{=mount_type=}=}" onclick="$('out').update(''); goUrl('/y/cgi?execute=func:netfs_write_config {=mount_type=}')">{=L:save=}</button>
 	{=if-equal:{=mount_type=}~1~
-	<button type="button" ytype="refresh" title="{=L:tools.netfs.autofs_restart=}" onclick="Y_NI_Tools('do_autofs restart', 5000)">{=L:reload=}</button>
+	<button type="button" ytype="refresh" title="{=L:tools.netfs.autofs_restart=}" onclick="Y_Tools('do_autofs restart', 5000)">{=L:reload=}</button>
 	~
 	=}
 	</div>

data/y-web/Y_Version.txt

@@ -1,3 +1,3 @@
-version=3.0.60
+version=3.0.61
-date=07.03.2023
+date=09.03.2023
 info=NI-Neutrino-Webinterface

data/y-web/info/yinfo.yhtm

@@ -1,19 +1,19 @@
-{=var-set:channelnr={=script:Y_NI_Tools getline /tmp/lcd/channelnr=}=}
+{=var-set:channelnr={=script:Y_Tools getline /tmp/lcd/channelnr=}=}
-{=var-set:duration={=script:Y_NI_Tools getline /tmp/lcd/duration=}=}
+{=var-set:duration={=script:Y_Tools getline /tmp/lcd/duration=}=}
-{=var-set:end={=script:Y_NI_Tools getline /tmp/lcd/end=}=}
+{=var-set:end={=script:Y_Tools getline /tmp/lcd/end=}=}
-{=var-set:event_curr={=script:Y_NI_Tools getline /tmp/lcd/event 1=}=}
+{=var-set:event_curr={=script:Y_Tools getline /tmp/lcd/event 1=}=}
-{=var-set:event_next={=script:Y_NI_Tools getline /tmp/lcd/event 2=}=}
+{=var-set:event_next={=script:Y_Tools getline /tmp/lcd/event 2=}=}
-{=var-set:logo={=script:Y_NI_Tools getline /tmp/lcd/logo=}=}
+{=var-set:logo={=script:Y_Tools getline /tmp/lcd/logo=}=}
-{=var-set:mode_ecm={=script:Y_NI_Tools getline /tmp/lcd/mode_ecm=}=}
+{=var-set:mode_ecm={=script:Y_Tools getline /tmp/lcd/mode_ecm=}=}
-{=var-set:mode_timer={=script:Y_NI_Tools getline /tmp/lcd/mode_timer=}=}
+{=var-set:mode_timer={=script:Y_Tools getline /tmp/lcd/mode_timer=}=}
-{=var-set:mode_rec={=script:Y_NI_Tools getline /tmp/lcd/mode_rec=}=}
+{=var-set:mode_rec={=script:Y_Tools getline /tmp/lcd/mode_rec=}=}
-{=var-set:mode_tshift={=script:Y_NI_Tools getline /tmp/lcd/mode_tshift=}=}
+{=var-set:mode_tshift={=script:Y_Tools getline /tmp/lcd/mode_tshift=}=}
-{=var-set:mode_logo={=script:Y_NI_Tools getline /tmp/lcd/mode_logo=}=}
+{=var-set:mode_logo={=script:Y_Tools getline /tmp/lcd/mode_logo=}=}
-{=var-set:progress={=script:Y_NI_Tools getline /tmp/lcd/progress=}=}
+{=var-set:progress={=script:Y_Tools getline /tmp/lcd/progress=}=}
-{=var-set:service={=script:Y_NI_Tools getline /tmp/lcd/service=}=}
+{=var-set:service={=script:Y_Tools getline /tmp/lcd/service=}=}
-{=var-set:start={=script:Y_NI_Tools getline /tmp/lcd/start=}=}
+{=var-set:start={=script:Y_Tools getline /tmp/lcd/start=}=}
-{=var-set:tuner={=script:Y_NI_Tools getline /tmp/lcd/tuner=}=}
+{=var-set:tuner={=script:Y_Tools getline /tmp/lcd/tuner=}=}
-{=var-set:volume={=script:Y_NI_Tools getline /tmp/lcd/volume=}=}
+{=var-set:volume={=script:Y_Tools getline /tmp/lcd/volume=}=}
 
 {=include-block:Y_Blocks.txt;head=}
 <meta http-equiv="refresh" content="15; URL=yinfo.yhtm">

data/y-web/scripts/Makefile.am

@@ -4,13 +4,6 @@ install_SCRIPTS = \
 	_Y_Globals.sh \
 	_Y_Library.sh \
 	Y_Camds.sh \
+	Y_NAS.sh \
 	Y_Plugins.sh \
 	Y_Tools.sh
-
-# file manager
-install_SCRIPTS += \
-	Y_NAS.sh
-
-# NI-yWeb
-install_SCRIPTS += \
-	Y_NI_Tools.sh

data/y-web/scripts/Y_NAS.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 # -----------------------------------------------------------
-# yWeb Extension: Filemgr (by yjogol)
+# yWeb Filemgr (by yjogol)
 # -----------------------------------------------------------
 
 # -----------------------------------------------------------

data/y-web/scripts/Y_NI_Tools.sh

@@ -1,596 +0,0 @@
-#!/bin/sh
-# -----------------------------------------------------------
-# Y NI Tools (NI-Team)
-# -----------------------------------------------------------
-if echo "$@" | grep -q "%20"; then
-	$0 ${@//%20/ }
-	exit
-fi
-
-. %(PRIVATE_HTTPDDIR)/scripts/_Y_Globals.sh
-. %(PRIVATE_HTTPDDIR)/scripts/_Y_Library.sh
-
-BNAME=${0##*/}
-
-PLUGIN_DIRS="%(PLUGINDIR) %(PLUGINDIR_VAR) %(PLUGINDIR_MNT) $(config_get_value_direct $y_config_neutrino 'plugin_hdd_dir')"
-
-getLanguage()
-{
-	Y_LANG=$(cat %(CONFIGDIR)/nhttpd.conf | grep "^Language.selected=" | cut -d= -f2)
-}
-
-file2msg() # $1 = file to show; $2 = short description; $3 = maketable or empty
-{
-	if [ -e $1 ]; then
-		echo "ok ($1 found)"
-		msg=$(cat $1)
-		if [ ! "$msg" ]; then
-			msg="no $2 available"
-			y_format_message_html
-			exit
-		fi
-		if [ "$3" == "maketable" ]; then
-			maketable $1
-		else
-			y_format_message_html
-		fi
-	else
-		echo "failed ($1 not found)"
-	fi
-}
-
-maketable() # $1 = file to format
-{
-        # header
-	echo "<div class='work_box'><div class='work_box_head'>"
-	echo "<div class='work_box_head_h2'>Formatted results</div></div>"
-	echo "<div class='work_box_body' style='overflow: auto; font-family: monospace'>"
-	# body
-	echo "<table style='border: 0 none;'>"
-	while read _a _b _c _d _e _f _g _h _i _j _k _l _m _n _o _p
-	do
-cat << eo_tbody
-	<tr>
-		<td>$_a</td>
-		<td>$_b</td>
-		<td>$_c</td>
-		<td>$_d</td>
-		<td>$_e</td>
-		<td>$_f</td>
-		<td>$_g</td>
-		<td>$_h</td>
-		<td>$_i</td>
-		<td>$_j</td>
-		<td>$_k</td>
-		<td>$_l</td>
-		<td>$_m</td>
-		<td>$_n</td>
-		<td>$_o</td>
-		<td>$_p</td>
-	</tr>
-eo_tbody
-	done < $1
-	echo "</table>"
-	# footer
-	echo "</div>"
-}
-
-is_mount()
-{
-        M=$1
-        test -e "$M" && cd "$M" && M=$(pwd -P)
-	while read _DEV _MTPT _FSTYPE _OPTS _REST
-	do
-		case "$M" in
-			"netfs")
-				if [ "$_FSTYPE" == "nfs" ] || [ "$_FSTYPE" == "cifs" ]; then
-					RET=0; break
-				else
-					RET=1; continue
-				fi
-			;;
-			"$_DEV"|"$_MTPT")
-				if [ "$_FSTYPE" == "autofs" ]; then
-					RET=1; continue
-				else
-					RET=0; break
-				fi
-			;;
-			*)
-				RET=1; continue
-			;;
-		esac
-	done < /etc/mtab
-	return $RET
-}
-
-is_exec()
-{
-        F=$1
-	test -x $y_path_varbin/$F
-	return $?
-}
-
-is_running()
-{
-	D=$1
-	pidof $D >/dev/null 2>&1
-	return $?	
-}
-
-action=$1; shift
-
-case "$action" in
-	getline)
-		FILE=$1
-		LINE=${2:-1}
-		if [ -f $FILE ]; then
-			tmp=$(sed -ne ''"${LINE}"'p' $FILE)
-			printf "%s" "$tmp"
-		fi
-	;;
-        is_exec)
-        	FILE=$1
-        	is_exec $FILE && printf "%s" "true" || printf "%s" "false"
-        ;;
-	is_running)
-		DEAMON=$1
-		is_running $DEAMON && printf "%s" "true" || printf "%s" "false"
-	;;
-	get_update_txt)
-		version="n/a"
-		#FIXME align url to box specs
-		wget -O /tmp/release.txt "http://neutrino-images.de/neutrino-images/update.php"
-		test -e /tmp/release.txt && version=$(cat /tmp/release.txt | grep ".img" | cut -d" " -f2)
-		echo "version=${version// /}" > /tmp/update.txt
-		rm -f /tmp/release.txt
-	;;
-	rm_update_txt)
-		rm -f /tmp/update.txt
-	;;
-	get_flash_info)
-		MTPT=""
-		case "$1" in
-			"var")		MTPT="/var"	;;
-			"root"|*)	MTPT="/"	;;
-		esac
-		df ${MTPT} | while read fs total used free used_percent mtpt; do
-			case ${mtpt} in
-				${MTPT})
-					used_percent=${used_percent//\%/}
-					free_percent=$(($free*100/$total))
-					total=$(($total/1024))
-					used=$(($used/1024))
-					free=$(($free/1024))
-					case $2 in
-						used_percent)	printf "%d" "$used_percent";;
-						free_percent)	printf "%d" "$free_percent";;
-						total)		printf "%d" "$total";;
-						used)		printf "%d" "$used";;
-						free)		printf "%d" "$free";;
-					esac
-					break
-				;;
-			esac
-		done
-	;;
-	get_mem_info)
-		while read _desc _size _unit; do
-			case $_desc in
-				"MemTotal:")	total=$_size	;;
-				"MemFree:")	free=$_size	;;
-				"Buffers:")	buffers=$_size	;;
-				"Cached:")	cached=$_size	;;
-			esac
-		done < /proc/meminfo
-		free=$(($free+$buffers+$cached))
-		used=$(($total-$free))
-		#used_percent=$(($used*100/$total))
-		used_percent=$((($used*200+total)/2/$total))
-		free_percent=$(($free*100/$total))
-		total=$(($total/1024))
-		used=$(($used/1024))
-		free=$(($free/1024))
-		case $1 in
-			used_percent)	printf "%d" "$used_percent";;
-			free_percent)	printf "%d" "$free_percent";;
-			total)		printf "%d" "$total";;
-			used)		printf "%d" "$used";;
-			free)		printf "%d" "$free";;
-		esac
-	;;
-	get_mtd_info)
-		while read dev size erasesize name; do
-			case ${dev:0:3} in
-				mtd)
-					test "$1" = "dev" && printf "%s<br/>" "$dev"
-					test "$1" = "name" && printf "%s<br/>" "${name//\"/}"
-				;;
-			esac
-		done < /proc/mtd
-	;;
-	get_cpu_info)
-		for i in 1 2; do
-			while read _cpu _user _nice _system _idle _rest; do
-				case $_cpu in
-					cpu)
-						case $i in
-							1)
-								fst_all=$(($_user + $_nice + $_system + $_idle))
-								fst_idle=$_idle
-							;;
-							2)
-								snd_all=$(($_user + $_nice + $_system + $_idle))
-								snd_idle=$_idle
-							;;
-						esac
-					;;
-				esac
-			done < /proc/stat
-			test $i = 1 && sleep 1
-		done
-
-		diff_all=$(($snd_all - $fst_all))
-		diff_idle=$(($snd_idle - $fst_idle))
-		_idle_percent=$(($diff_idle * 100 / $diff_all))
-		_used_percent=$((100 - $_idle_percent))
-
-		case $1 in
-			used_percent)	printf "%s" "$_used_percent";;
-		esac
-	;;
-	# camd-control
-	#softcamstop)	%(PRIVATE_HTTPDDIR)/scripts/Y_Camds.sh stop;;
-	#softcamstart)	%(PRIVATE_HTTPDDIR)/scripts/Y_Camds.sh start;;
-	softcamreset)	%(PRIVATE_HTTPDDIR)/scripts/Y_Camds.sh reset;;
-	mgcamdstop)	%(PRIVATE_HTTPDDIR)/scripts/Y_Camds.sh mgcamd_stop;;
-	mgcamdstart)	%(PRIVATE_HTTPDDIR)/scripts/Y_Camds.sh mgcamd_start;;
-	mgcamdreset)	%(PRIVATE_HTTPDDIR)/scripts/Y_Camds.sh mgcamd_reset;;
-	gboxstop)	%(PRIVATE_HTTPDDIR)/scripts/Y_Camds.sh gbox_stop;;
-	gboxstart)	%(PRIVATE_HTTPDDIR)/scripts/Y_Camds.sh gbox_start;;
-	gboxreset)	%(PRIVATE_HTTPDDIR)/scripts/Y_Camds.sh gbox_reset;;
-	oscamstop)	%(PRIVATE_HTTPDDIR)/scripts/Y_Camds.sh oscam_stop;;
-	oscamstart)	%(PRIVATE_HTTPDDIR)/scripts/Y_Camds.sh oscam_start;;
-	oscamreset)	%(PRIVATE_HTTPDDIR)/scripts/Y_Camds.sh oscam_reset;;
-	osmodstop)	%(PRIVATE_HTTPDDIR)/scripts/Y_Camds.sh osmod_stop;;
-	osmodstart)	%(PRIVATE_HTTPDDIR)/scripts/Y_Camds.sh osmod_start;;
-	osmodreset)	%(PRIVATE_HTTPDDIR)/scripts/Y_Camds.sh osmod_reset;;
-	ncamstop)	%(PRIVATE_HTTPDDIR)/scripts/Y_Camds.sh ncam_stop;;
-	ncamstart)	%(PRIVATE_HTTPDDIR)/scripts/Y_Camds.sh ncam_start;;
-	ncamreset)	%(PRIVATE_HTTPDDIR)/scripts/Y_Camds.sh ncam_reset;;
-	cccamstop)	%(PRIVATE_HTTPDDIR)/scripts/Y_Camds.sh ccccam_stop;;
-	cccamstart)	%(PRIVATE_HTTPDDIR)/scripts/Y_Camds.sh ccccam_start;;
-	cccamreset)	%(PRIVATE_HTTPDDIR)/scripts/Y_Camds.sh cccam_reset;;
-	doscamstop)	%(PRIVATE_HTTPDDIR)/scripts/Y_Camds.sh doscam_stop;;
-	doscamstart)	%(PRIVATE_HTTPDDIR)/scripts/Y_Camds.sh doscam_start;;
-	doscamreset)	%(PRIVATE_HTTPDDIR)/scripts/Y_Camds.sh doscam_reset;;
-
-	vinfo)
-	        if ! [ -x $y_path_varbin/$1 ]; then
-	        	printf "%s" "n/a"
-	        	exit
-	        fi
-		CAM=$(echo $1 | tr [:lower:] [:upper:])
-		if [ "$CAM" = "GBOX" ]; then
-			CAM=GBOX.NET
-		fi
-		V=$(vinfo $CAM $y_path_varbin/$1)
-		printf "%s" "${V//keine Informationen gefunden/}"
-	;;
-
-	# syntax	file2msg file "short-description" (maketable)
-	mgshareinfo)	file2msg /tmp/mgshare.info "n-lines" maketable;;
-	mginfo)		file2msg /tmp/mg.info "cs-info" maketable;;
-	cccamdinfo)	file2msg /tmp/cccamd.info "c-lines" maketable;;
-	shareonl)	file2msg /tmp/share.onl "online-share-info" maketable;;
-	shareinfo)	file2msg /tmp/share.info "cs-info" maketable;;
-	sc01info)	file2msg /tmp/sc01.info "slot1-info";;
-	sc02info)	file2msg /tmp/sc02.info "slot2-info";;
-	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";;
-	ccccamversion)	file2msg /tmp/.cccam/cccam.version "cccam-info";;
-	doscamversion)	file2msg /tmp/.doscam/doscam.version "doscam-info";;
-
-	get_oscam_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:-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)
-			_port=$(echo $_port | dos2unix -u)
-		fi
-		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)
-			_port=$(echo $_port | dos2unix -u)
-		fi
-		printf "%s" ${_port:-8080}
-	;;
-
-	get_minidlnad_webif_port)
-		if [ -e /etc/minidlna.conf ]; then
-			_port=$(grep -m 1 "^[:space:]*port=" /etc/minidlna.conf | cut -d'=' -f2)
-			_port=$(echo $_port | dos2unix -u)
-		fi
-		printf "%s" $_port
-	;;
-
-	get_xupnpd_webif_port)
-		if [ -e /share/xupnpd/xupnpd.lua ]; then
-			_port=$(grep -m 1 "^[:space:]*cfg.http_port" /share/xupnpd/xupnpd.lua | cut -d'=' -f2)
-			_port=$(echo $_port | dos2unix -u)
-		fi
-		printf "%s" $_port
-	;;
-
-	countcards)
-		getLanguage
-		if [ "$Y_LANG" == "Deutsch" ]
-		then
-			Y_L_count="Karten sind online."
-			Y_L_recount="können weitergegeben werden."
-		else
-			Y_L_count="cards online."
-			Y_L_recount="can be shared."
-		fi
-		FILE=$1
-		COUNT=0
-		_DIST=""
-		_LEV=""
-		if [ -f $FILE ]; then
-			COUNT=$(cat $FILE | wc -l | sed 's/^ *//')
-			echo "<b>$COUNT</b> $Y_L_count"
-			test $COUNT = 0 && exit
-
-			RECOUNT=$(cat $FILE | grep -v Lev:0 | wc -l | sed 's/^ *//')
-			echo "<b>$RECOUNT</b> $Y_L_recount"
-
-			for i in $(seq 0 9); do
-				DIST=$(cat $FILE | grep -H dist:$i | wc -l | sed 's/^ *//')
-				test $DIST = 0 || _DIST=$(echo -e "$_DIST\n\tDist. $i: $DIST")
-			done
-			for i in $(seq 0 9); do
-				LEV=$(cat $FILE | grep -H Lev:$i | wc -l | sed 's/^ *//')
-				test $LEV = 0 || _LEV=$(echo -e "$_LEV\n\tLevel $i: $LEV")
-			done
-
-			echo "<pre>$_LEV<br/>$_DIST</pre>"
-		else
-			echo "failed ($FILE not found)"
-			exit
-		fi
-
-		test $COUNT = 0 && echo "Es sind derzeit keine Karten online!"
-	;;
-
-	# zapit-control
-	resolution)
-		pzapit --${1}		&& echo "ok" || echo "failed"
-	;;
-	43mode)
-		pzapit -vm43 ${1}	&& echo "ok" || echo "failed"
-	;;
-	reload_channellists)
-		pzapit -c		&& echo "ok" || echo "failed"
-	;;
-	reset_tuner)
-				E=0
-		pzapit -esb;	E=$(($E+$?));	sleep 1
-		pzapit -lsb;	E=$(($E+$?));	sleep 1
-		pzapit -rz;	E=$(($E+$?))
-		test $E = 0	&& echo "ok" || echo "failed"
-	;;
-	# netfs-control
-	is_mount)
-		MTPT=$1
-		is_mount $MTPT && printf "%s" "true" || printf "%s" "false"
-	;;
-	do_mount_all)
-		msg=$(/etc/init.d/fstab start_netfs)
-		y_format_message_html
-	;;
-	do_umount_all)
-		msg=$(/etc/init.d/fstab stop_netfs)
-		y_format_message_html
-	;;
-	do_mount)
-	        MTPT=$1
-	        test $MTPT || exit 1
-		test -d $MTPT || mkdir -p $MTPT;
-		FLAG="/var/etc/.srv"
-		if OUT=$(mount $MTPT 2>&1 >/dev/null); then
-			RET=$?
-			msg="mount: $MTPT - success ($RET)"
-			test -e $FLAG || touch $FLAG
-		else
-			RET=$?
-			msg="mount: $MTPT - failed ($RET)<br>$OUT"
-		fi
-		y_format_message_html
-	;;
-	do_umount)
-	        MTPT=$1
-	        test $MTPT || exit 1
-		FLAG="/var/etc/.srv"
-		rm -f $FLAG
-		if OUT=$(umount $MTPT 2>&1 >/dev/null); then
-			RET=$?
-			msg="umount: $MTPT - success ($RET)"
-		else
-			RET=$?
-			msg="umount: $MTPT - failed ($RET)<br>$OUT"
-		fi
-		is_mount netfs && touch $FLAG
-		y_format_message_html
-	;;
-	# automounter-control
-	do_autofs)
-		case $1 in
-			start|stop|restart|reload)
-				msg=$(service autofs $1)
-				y_format_message_html
-			;;
-		esac
-	;;
-	# infoicons-control
-	rm_icons_flag)
-		while [ $1 ]; do
-			if [ -e $1 ]; then
-				rm -f $1 && echo "ok ($1 removed)<br />" || echo "failed (can't remove $1)<br />"
-			else
-				echo "nothing to do ($1 not found)<br />"
-			fi
-			shift
-		done
-	;;
-	touch_icons_flag)
-		while [ $1 ]; do
-			if [ ! -e $1 ]; then
-				touch $1 && echo "ok ($1 created)<br />" || echo "failed (can't create $1)<br />"
-			else
-				echo "nothing to do ($1 always exist)<br />"
-			fi
-			shift
-		done
-	;;
-	read_icons_flag)
-		test -z $1 && exit 1
-		test -e $1 && S=$(cat $1)
-		printf "%s" "$S"
-	;;
-	# plugin-control
-	p_fcm_start)		%(PRIVATE_HTTPDDIR)/scripts/Y_Plugins.sh fcm_start;;
-	p_fcm_stop)		%(PRIVATE_HTTPDDIR)/scripts/Y_Plugins.sh fcm_stop;;
-	p_nfs_start)		%(PRIVATE_HTTPDDIR)/scripts/Y_Plugins.sh nfs_start;;
-	p_nfs_stop)		%(PRIVATE_HTTPDDIR)/scripts/Y_Plugins.sh nfs_stop;;
-	p_samba_start)		%(PRIVATE_HTTPDDIR)/scripts/Y_Plugins.sh samba_start;;
-	p_samba_stop)		%(PRIVATE_HTTPDDIR)/scripts/Y_Plugins.sh samba_stop;;
-	p_tuxcald_start)	%(PRIVATE_HTTPDDIR)/scripts/Y_Plugins.sh tuxcald_start;;
-	p_tuxcald_stop)		%(PRIVATE_HTTPDDIR)/scripts/Y_Plugins.sh tuxcald_stop;;
-	p_tuxmaild_start)	%(PRIVATE_HTTPDDIR)/scripts/Y_Plugins.sh tuxmaild_start;;
-	p_tuxmaild_stop)	%(PRIVATE_HTTPDDIR)/scripts/Y_Plugins.sh tuxmaild_stop;;
-	p_inadyn_start)		%(PRIVATE_HTTPDDIR)/scripts/Y_Plugins.sh inadyn_start;;
-	p_inadyn_stop)		%(PRIVATE_HTTPDDIR)/scripts/Y_Plugins.sh inadyn_stop;;
-	p_dropbear_start)	%(PRIVATE_HTTPDDIR)/scripts/Y_Plugins.sh dropbear_start;;
-	p_dropbear_stop)	%(PRIVATE_HTTPDDIR)/scripts/Y_Plugins.sh dropbear_stop;;
-	p_ushare_start)		%(PRIVATE_HTTPDDIR)/scripts/Y_Plugins.sh ushare_start;;
-	p_ushare_stop)		%(PRIVATE_HTTPDDIR)/scripts/Y_Plugins.sh ushare_stop;;
-	p_djmount_start)	%(PRIVATE_HTTPDDIR)/scripts/Y_Plugins.sh djmount_start;;
-	p_djmount_stop)		%(PRIVATE_HTTPDDIR)/scripts/Y_Plugins.sh djmount_stop;;
-	p_minidlna_start)	%(PRIVATE_HTTPDDIR)/scripts/Y_Plugins.sh minidlna_start;;
-	p_minidlna_stop)	%(PRIVATE_HTTPDDIR)/scripts/Y_Plugins.sh minidlna_stop;;
-	p_xupnpd_start)		%(PRIVATE_HTTPDDIR)/scripts/Y_Plugins.sh xupnpd_start;;
-	p_xupnpd_stop)		%(PRIVATE_HTTPDDIR)/scripts/Y_Plugins.sh xupnpd_stop;;
-	p_crond_start)		%(PRIVATE_HTTPDDIR)/scripts/Y_Plugins.sh crond_start;;
-	p_crond_stop)		%(PRIVATE_HTTPDDIR)/scripts/Y_Plugins.sh crond_stop;;
-	# plugins on blue-button
-	p_show)
-		PLUGIN=$1
-		for PLUGIN_DIR in $PLUGIN_DIRS
-		do
-			cd $PLUGIN_DIR
-			test -w "$PLUGIN" || continue
-			echo "[$BNAME] modifying $PLUGIN_DIR/$PLUGIN"
-			sed -i "s/^\(hide=\).*$/\1"0"/" $PLUGIN
-		done
-	;;
-	p_hide)
-		PLUGIN=$1
-		for PLUGIN_DIR in $PLUGIN_DIRS
-		do
-			cd $PLUGIN_DIR
-			test -w "$PLUGIN" || continue
-			echo "[$BNAME] modifying $PLUGIN_DIR/$PLUGIN"
-			# fix for missing trailing linefeed in cfg-file
-			test "$(tail -c1 $PLUGIN)" != "" && echo "" >> $PLUGIN
-			if grep -q "^hide=" $PLUGIN
-			then
-				sed -i "s/^\(hide=\).*$/\1"1"/" $PLUGIN
-			else
-				echo "hide=1" >> $PLUGIN
-			fi
-		done
-	;;
-	p_list)
-		getLanguage
-		if [ "$Y_LANG" == "Deutsch" ]
-		then
-			Y_L_show="Anzeigen"
-			Y_L_hide="Verstecken"
-		else
-			Y_L_show="Show"
-			Y_L_hide="Hide"
-		fi
-		for PLUGIN_DIR in $PLUGIN_DIRS
-		do
-			test -e $PLUGIN_DIR || continue
-			cd $PLUGIN_DIR
-			PLUGINS=$(ls -1 *.cfg 2>/dev/null)
-			for PLUGIN in $PLUGINS
-			do
-				if [ "$1" == "lua" ]
-				then
-					# lua-plugins don't need the executable flag
-					test -e ${PLUGIN%%.*}.${1} || continue
-				else
-					test -x ${PLUGIN%%.*}.${1} || continue
-				fi
-				NAME=$(cat $PLUGIN | grep "^name=" | cut -d= -f2)
-				HIDE=$(cat $PLUGIN | grep "^hide=" | cut -d= -f2)
-				case $HIDE in
-					1)
-						IMG="<img src='images/x_red.png' class='status'>"
-						INP="<input type='button' value='$Y_L_show' onclick='Y_NI_Tools(\"p_show $PLUGIN\", 1000);' />"
-					;;
-					*)
-						IMG="<img src='images/check_green.png' class='status'>"
-						INP="<input type='button' value='$Y_L_hide' onclick='Y_NI_Tools(\"p_hide $PLUGIN\", 1000);' />"
-					;;
-				esac
-cat << eoPLUGIN
-			<!-- $NAME -->
-			<tr class="list">
-				<td>
-					$IMG
-					<span title="$PLUGIN_DIR/${PLUGIN%%.*}.${1}">
-						$NAME
-					</span>
-				</td>
-				<td>
-					$INP
-				</td>
-			</tr>
-eoPLUGIN
-			done
-		done
-	;;
-	*)
-		echo "[$BNAME] Parameter wrong: $action $*"
-	;;
-esac

data/y-web/scripts/Y_Tools.sh

@@ -3,8 +3,17 @@
 # Tools (yjogol)
 # -----------------------------------------------------------
 
-. ./_Y_Globals.sh
+if echo "$@" | grep -q "%20"; then
-. ./_Y_Library.sh
+	$0 ${@//%20/ }
+	exit
+fi
+
+. %(PRIVATE_HTTPDDIR)/scripts/_Y_Globals.sh
+. %(PRIVATE_HTTPDDIR)/scripts/_Y_Library.sh
+
+BNAME=${0##*/}
+
+PLUGIN_DIRS="%(PLUGINDIR) %(PLUGINDIR_VAR) %(PLUGINDIR_MNT) $(config_get_value_direct $y_config_neutrino 'plugin_hdd_dir')"
 
 # ===========================================================
 # Settings : Styles
@@ -465,41 +474,147 @@ restart_neutrino()
 	#kill -HUP `pidof neutrino`
 }
 
+getLanguage()
+{
+	Y_LANG=$(cat %(CONFIGDIR)/nhttpd.conf | grep "^Language.selected=" | cut -d= -f2)
+}
+
+file2msg() # $1 = file to show; $2 = short description; $3 = maketable or empty
+{
+	if [ -e $1 ]; then
+		echo "ok ($1 found)"
+		msg=$(cat $1)
+		if [ ! "$msg" ]; then
+			msg="no $2 available"
+			y_format_message_html
+			exit
+		fi
+		if [ "$3" == "maketable" ]; then
+			maketable $1
+		else
+			y_format_message_html
+		fi
+	else
+		echo "failed ($1 not found)"
+	fi
+}
+
+maketable() # $1 = file to format
+{
+        # header
+	echo "<div class='work_box'><div class='work_box_head'>"
+	echo "<div class='work_box_head_h2'>Formatted results</div></div>"
+	echo "<div class='work_box_body' style='overflow: auto; font-family: monospace'>"
+	# body
+	echo "<table style='border: 0 none;'>"
+	while read _a _b _c _d _e _f _g _h _i _j _k _l _m _n _o _p
+	do
+cat << eo_tbody
+	<tr>
+		<td>$_a</td>
+		<td>$_b</td>
+		<td>$_c</td>
+		<td>$_d</td>
+		<td>$_e</td>
+		<td>$_f</td>
+		<td>$_g</td>
+		<td>$_h</td>
+		<td>$_i</td>
+		<td>$_j</td>
+		<td>$_k</td>
+		<td>$_l</td>
+		<td>$_m</td>
+		<td>$_n</td>
+		<td>$_o</td>
+		<td>$_p</td>
+	</tr>
+eo_tbody
+	done < $1
+	echo "</table>"
+	# footer
+	echo "</div>"
+}
+
+is_mount()
+{
+        M=$1
+        test -e "$M" && cd "$M" && M=$(pwd -P)
+	while read _DEV _MTPT _FSTYPE _OPTS _REST
+	do
+		case "$M" in
+			"netfs")
+				if [ "$_FSTYPE" == "nfs" ] || [ "$_FSTYPE" == "cifs" ]; then
+					RET=0; break
+				else
+					RET=1; continue
+				fi
+			;;
+			"$_DEV"|"$_MTPT")
+				if [ "$_FSTYPE" == "autofs" ]; then
+					RET=1; continue
+				else
+					RET=0; break
+				fi
+			;;
+			*)
+				RET=1; continue
+			;;
+		esac
+	done < /etc/mtab
+	return $RET
+}
+
+is_exec()
+{
+        F=$1
+	test -x $y_path_varbin/$F
+	return $?
+}
+
+is_running()
+{
+	D=$1
+	pidof $D >/dev/null 2>&1
+	return $?
+}
+
 # -----------------------------------------------------------
 # Main
 # -----------------------------------------------------------
 # debug
 #echo "call:$*" >> "/tmp/debug.txt"
-case "$1" in
+action=$1; shift
-	style_set)			style_set $2 ;;
+
+case "$action" in
+	style_set)			style_set $1 ;;
 	style_get)			style_get ;;
 	image_upload)			image_upload ;;
-	image_backup)			image_backup_mtd $2; echo "/tmp/flash_mtd$2.img" ;;
+	image_backup)			image_backup_mtd $1; echo "/tmp/flash_mtd$1.img" ;;
-	zapit_upload)			zapit_upload $2 ;;
+	zapit_upload)			zapit_upload $1 ;;
 	kernel-stack)			msg=`dmesg`; y_format_message_html ;;
 	ps)				msg=`ps aux`; y_format_message_html ;;
 	free)				f=`free`; p=`df -h`; msg="RAM Memory use\n-------------------\n$f\n\nPartitions\n-------------------\n$p"; y_format_message_html ;;
 	yreboot)			reboot; echo "Reboot..." ;;
 	check_yWeb_conf) 		check_yWeb_conf ;;
-	rcsim)				rcsim $2 >/dev/null ;;
+	rcsim)				rcsim $1 >/dev/null ;;
-	domount)			shift 1; do_mount $* ;;
+	domount)			do_mount $* ;;
-	dounmount)			shift 1; do_unmount $* ;;
+	dounmount)			do_unmount $* ;;
-	cmd)				shift 1; do_cmd $* ;;
+	cmd)				do_cmd $* ;;
-	installer)			shift 1; do_installer $* 2>&1 ;;
+	installer)			do_installer $* 2>&1 ;;
-	ext_uninstaller)		shift 1; do_ext_uninstaller $* 2>&1 ;;
+	ext_uninstaller)		do_ext_uninstaller $* 2>&1 ;;
-	ext_installer)			shift 1; do_ext_installer $* 2>&1 ;;
+	ext_installer)			do_ext_installer $* 2>&1 ;;
-	proc)				shift 1; proc $* ;;
+	proc)				proc $* ;;
-	wol)				shift 1; wol $* ;;
+	wol)				wol $* ;;
-	fbshot)				shift 1; do_fbshot $* ;;
+	fbshot)				do_fbshot $* ;;
 	fbshot_clear)			do_fbshot_clear ;;
 	screenshot_clear)		do_screenshot_clear ;;
 	get_update_version)		wget -O /tmp/version.txt "https://raw.githubusercontent.com/neutrino-images/ni-neutrino/master/data/y-web/Y_Version.txt" ;;
 	rm_update_version)		rm -f /tmp/version.txt ;;
-	settings_backup_restore)	shift 1; do_settings_backup_restore $* ;;
+	settings_backup_restore)	do_settings_backup_restore $* ;;
-	exec_cmd)			shift 1; $* ;;
+	exec_cmd)			$* ;;
-	automount_list)			shift 1; do_automount_list $* ;;
+	automount_list)			do_automount_list $* ;;
-	automount_getline)		shift 1; do_automount_getline $* ;;
+	automount_getline)		do_automount_getline $* ;;
-	automount_setline)		shift 1; do_automount_setline $* ;;
+	automount_setline)		do_automount_setline $* ;;
 	restart_neutrino)		restart_neutrino ;;
 	have_plugin_scripts)	 	find %(PLUGINDIR_VAR) -name '*.sh' ;;
 
@@ -526,11 +641,9 @@ case "$1" in
 		fi
 	;;
 	write_extension_list)
-		shift 1
 		echo  "$*" >$y_path_config/extensions.txt
 	;;
 	url_get)
-		shift 1
 		res=`wget -O /tmp/$2 "$1" >/tmp/url.log 2>&1`
 		cat /tmp/$2
 	;;
@@ -556,6 +669,482 @@ case "$1" in
 	get_hostname)
 		echo -n $(hostname)
 	;;
+	getline)
+		FILE=$1
+		LINE=${2:-1}
+		if [ -f $FILE ]; then
+			tmp=$(sed -ne ''"${LINE}"'p' $FILE)
+			printf "%s" "$tmp"
+		fi
+	;;
+	is_exec)
+		FILE=$1
+		is_exec $FILE && printf "%s" "true" || printf "%s" "false"
+	;;
+	is_running)
+		DEAMON=$1
+		is_running $DEAMON && printf "%s" "true" || printf "%s" "false"
+	;;
+	get_update_txt)
+		version="n/a"
+		#FIXME align url to box specs
+		wget -O /tmp/release.txt "http://neutrino-images.de/neutrino-images/update.php"
+		test -e /tmp/release.txt && version=$(cat /tmp/release.txt | grep ".img" | cut -d" " -f2)
+		echo "version=${version// /}" > /tmp/update.txt
+		rm -f /tmp/release.txt
+	;;
+	rm_update_txt)
+		rm -f /tmp/update.txt
+	;;
+	get_flash_info)
+		MTPT=""
+		case "$1" in
+			"var")		MTPT="/var"	;;
+			"root"|*)	MTPT="/"	;;
+		esac
+		df ${MTPT} | while read fs total used free used_percent mtpt; do
+			case ${mtpt} in
+				${MTPT})
+					used_percent=${used_percent//\%/}
+					free_percent=$(($free*100/$total))
+					total=$(($total/1024))
+					used=$(($used/1024))
+					free=$(($free/1024))
+					case $2 in
+						used_percent)	printf "%d" "$used_percent";;
+						free_percent)	printf "%d" "$free_percent";;
+						total)		printf "%d" "$total";;
+						used)		printf "%d" "$used";;
+						free)		printf "%d" "$free";;
+					esac
+					break
+				;;
+			esac
+		done
+	;;
+	get_mem_info)
+		while read _desc _size _unit; do
+			case $_desc in
+				"MemTotal:")	total=$_size	;;
+				"MemFree:")	free=$_size	;;
+				"Buffers:")	buffers=$_size	;;
+				"Cached:")	cached=$_size	;;
+			esac
+		done < /proc/meminfo
+		free=$(($free+$buffers+$cached))
+		used=$(($total-$free))
+		#used_percent=$(($used*100/$total))
+		used_percent=$((($used*200+total)/2/$total))
+		free_percent=$(($free*100/$total))
+		total=$(($total/1024))
+		used=$(($used/1024))
+		free=$(($free/1024))
+		case $1 in
+			used_percent)	printf "%d" "$used_percent";;
+			free_percent)	printf "%d" "$free_percent";;
+			total)		printf "%d" "$total";;
+			used)		printf "%d" "$used";;
+			free)		printf "%d" "$free";;
+		esac
+	;;
+	get_mtd_info)
+		while read dev size erasesize name; do
+			case ${dev:0:3} in
+				mtd)
+					test "$1" = "dev" && printf "%s<br/>" "$dev"
+					test "$1" = "name" && printf "%s<br/>" "${name//\"/}"
+				;;
+			esac
+		done < /proc/mtd
+	;;
+	get_cpu_info)
+		for i in 1 2; do
+			while read _cpu _user _nice _system _idle _rest; do
+				case $_cpu in
+					cpu)
+						case $i in
+							1)
+								fst_all=$(($_user + $_nice + $_system + $_idle))
+								fst_idle=$_idle
+							;;
+							2)
+								snd_all=$(($_user + $_nice + $_system + $_idle))
+								snd_idle=$_idle
+							;;
+						esac
+					;;
+				esac
+			done < /proc/stat
+			test $i = 1 && sleep 1
+		done
+
+		diff_all=$(($snd_all - $fst_all))
+		diff_idle=$(($snd_idle - $fst_idle))
+		_idle_percent=$(($diff_idle * 100 / $diff_all))
+		_used_percent=$((100 - $_idle_percent))
+
+		case $1 in
+			used_percent)	printf "%s" "$_used_percent";;
+		esac
+	;;
+
+	# camds
+	#softcamstop)	%(PRIVATE_HTTPDDIR)/scripts/Y_Camds.sh stop;;
+	#softcamstart)	%(PRIVATE_HTTPDDIR)/scripts/Y_Camds.sh start;;
+	softcamreset)	%(PRIVATE_HTTPDDIR)/scripts/Y_Camds.sh reset;;
+	mgcamdstop)	%(PRIVATE_HTTPDDIR)/scripts/Y_Camds.sh mgcamd_stop;;
+	mgcamdstart)	%(PRIVATE_HTTPDDIR)/scripts/Y_Camds.sh mgcamd_start;;
+	mgcamdreset)	%(PRIVATE_HTTPDDIR)/scripts/Y_Camds.sh mgcamd_reset;;
+	gboxstop)	%(PRIVATE_HTTPDDIR)/scripts/Y_Camds.sh gbox_stop;;
+	gboxstart)	%(PRIVATE_HTTPDDIR)/scripts/Y_Camds.sh gbox_start;;
+	gboxreset)	%(PRIVATE_HTTPDDIR)/scripts/Y_Camds.sh gbox_reset;;
+	oscamstop)	%(PRIVATE_HTTPDDIR)/scripts/Y_Camds.sh oscam_stop;;
+	oscamstart)	%(PRIVATE_HTTPDDIR)/scripts/Y_Camds.sh oscam_start;;
+	oscamreset)	%(PRIVATE_HTTPDDIR)/scripts/Y_Camds.sh oscam_reset;;
+	osmodstop)	%(PRIVATE_HTTPDDIR)/scripts/Y_Camds.sh osmod_stop;;
+	osmodstart)	%(PRIVATE_HTTPDDIR)/scripts/Y_Camds.sh osmod_start;;
+	osmodreset)	%(PRIVATE_HTTPDDIR)/scripts/Y_Camds.sh osmod_reset;;
+	ncamstop)	%(PRIVATE_HTTPDDIR)/scripts/Y_Camds.sh ncam_stop;;
+	ncamstart)	%(PRIVATE_HTTPDDIR)/scripts/Y_Camds.sh ncam_start;;
+	ncamreset)	%(PRIVATE_HTTPDDIR)/scripts/Y_Camds.sh ncam_reset;;
+	cccamstop)	%(PRIVATE_HTTPDDIR)/scripts/Y_Camds.sh ccccam_stop;;
+	cccamstart)	%(PRIVATE_HTTPDDIR)/scripts/Y_Camds.sh ccccam_start;;
+	cccamreset)	%(PRIVATE_HTTPDDIR)/scripts/Y_Camds.sh cccam_reset;;
+	doscamstop)	%(PRIVATE_HTTPDDIR)/scripts/Y_Camds.sh doscam_stop;;
+	doscamstart)	%(PRIVATE_HTTPDDIR)/scripts/Y_Camds.sh doscam_start;;
+	doscamreset)	%(PRIVATE_HTTPDDIR)/scripts/Y_Camds.sh doscam_reset;;
+
+	vinfo)
+	        if ! [ -x $y_path_varbin/$1 ]; then
+			printf "%s" "n/a"
+			exit
+	        fi
+		CAM=$(echo $1 | tr [:lower:] [:upper:])
+		if [ "$CAM" = "GBOX" ]; then
+			CAM=GBOX.NET
+		fi
+		V=$(vinfo $CAM $y_path_varbin/$1)
+		printf "%s" "${V//keine Informationen gefunden/}"
+	;;
+
+	# syntax	file2msg file "short-description" (maketable)
+	mgshareinfo)	file2msg /tmp/mgshare.info "n-lines" maketable;;
+	mginfo)		file2msg /tmp/mg.info "cs-info" maketable;;
+	cccamdinfo)	file2msg /tmp/cccamd.info "c-lines" maketable;;
+	shareonl)	file2msg /tmp/share.onl "online-share-info" maketable;;
+	shareinfo)	file2msg /tmp/share.info "cs-info" maketable;;
+	sc01info)	file2msg /tmp/sc01.info "slot1-info";;
+	sc02info)	file2msg /tmp/sc02.info "slot2-info";;
+	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";;
+	ccccamversion)	file2msg /tmp/.cccam/cccam.version "cccam-info";;
+	doscamversion)	file2msg /tmp/.doscam/doscam.version "doscam-info";;
+
+	get_oscam_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:-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)
+			_port=$(echo $_port | dos2unix -u)
+		fi
+		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)
+			_port=$(echo $_port | dos2unix -u)
+		fi
+		printf "%s" ${_port:-8080}
+	;;
+
+	get_minidlnad_webif_port)
+		if [ -e /etc/minidlna.conf ]; then
+			_port=$(grep -m 1 "^[:space:]*port=" /etc/minidlna.conf | cut -d'=' -f2)
+			_port=$(echo $_port | dos2unix -u)
+		fi
+		printf "%s" $_port
+	;;
+
+	get_xupnpd_webif_port)
+		if [ -e /share/xupnpd/xupnpd.lua ]; then
+			_port=$(grep -m 1 "^[:space:]*cfg.http_port" /share/xupnpd/xupnpd.lua | cut -d'=' -f2)
+			_port=$(echo $_port | dos2unix -u)
+		fi
+		printf "%s" $_port
+	;;
+
+	countcards)
+		getLanguage
+		if [ "$Y_LANG" == "Deutsch" ]
+		then
+			Y_L_count="Karten sind online."
+			Y_L_recount="können weitergegeben werden."
+		else
+			Y_L_count="cards online."
+			Y_L_recount="can be shared."
+		fi
+		FILE=$1
+		COUNT=0
+		_DIST=""
+		_LEV=""
+		if [ -f $FILE ]; then
+			COUNT=$(cat $FILE | wc -l | sed 's/^ *//')
+			echo "<b>$COUNT</b> $Y_L_count"
+			test $COUNT = 0 && exit
+
+			RECOUNT=$(cat $FILE | grep -v Lev:0 | wc -l | sed 's/^ *//')
+			echo "<b>$RECOUNT</b> $Y_L_recount"
+
+			for i in $(seq 0 9); do
+				DIST=$(cat $FILE | grep -H dist:$i | wc -l | sed 's/^ *//')
+				test $DIST = 0 || _DIST=$(echo -e "$_DIST\n\tDist. $i: $DIST")
+			done
+			for i in $(seq 0 9); do
+				LEV=$(cat $FILE | grep -H Lev:$i | wc -l | sed 's/^ *//')
+				test $LEV = 0 || _LEV=$(echo -e "$_LEV\n\tLevel $i: $LEV")
+			done
+
+			echo "<pre>$_LEV<br/>$_DIST</pre>"
+		else
+			echo "failed ($FILE not found)"
+			exit
+		fi
+
+		test $COUNT = 0 && echo "Es sind derzeit keine Karten online!"
+	;;
+
+	# zapit
+	resolution)
+		pzapit --${1}		&& echo "ok" || echo "failed"
+	;;
+	43mode)
+		pzapit -vm43 ${1}	&& echo "ok" || echo "failed"
+	;;
+	reload_channellists)
+		pzapit -c		&& echo "ok" || echo "failed"
+	;;
+	reset_tuner)
+				E=0
+		pzapit -esb;	E=$(($E+$?));	sleep 1
+		pzapit -lsb;	E=$(($E+$?));	sleep 1
+		pzapit -rz;	E=$(($E+$?))
+		test $E = 0	&& echo "ok" || echo "failed"
+	;;
+
+	# netfs
+	is_mount)
+		MTPT=$1
+		is_mount $MTPT && printf "%s" "true" || printf "%s" "false"
+	;;
+	do_mount_all)
+		msg=$(/etc/init.d/fstab start_netfs)
+		y_format_message_html
+	;;
+	do_umount_all)
+		msg=$(/etc/init.d/fstab stop_netfs)
+		y_format_message_html
+	;;
+	do_mount)
+	        MTPT=$1
+	        test $MTPT || exit 1
+		test -d $MTPT || mkdir -p $MTPT;
+		FLAG="/var/etc/.srv"
+		if OUT=$(mount $MTPT 2>&1 >/dev/null); then
+			RET=$?
+			msg="mount: $MTPT - success ($RET)"
+			test -e $FLAG || touch $FLAG
+		else
+			RET=$?
+			msg="mount: $MTPT - failed ($RET)<br>$OUT"
+		fi
+		y_format_message_html
+	;;
+	do_umount)
+	        MTPT=$1
+	        test $MTPT || exit 1
+		FLAG="/var/etc/.srv"
+		rm -f $FLAG
+		if OUT=$(umount $MTPT 2>&1 >/dev/null); then
+			RET=$?
+			msg="umount: $MTPT - success ($RET)"
+		else
+			RET=$?
+			msg="umount: $MTPT - failed ($RET)<br>$OUT"
+		fi
+		is_mount netfs && touch $FLAG
+		y_format_message_html
+	;;
+
+	# automounter
+	do_autofs)
+		case $1 in
+			start|stop|restart|reload)
+				msg=$(service autofs $1)
+				y_format_message_html
+			;;
+		esac
+	;;
+
+	# infoicons
+	rm_icons_flag)
+		while [ $1 ]; do
+			if [ -e $1 ]; then
+				rm -f $1 && echo "ok ($1 removed)<br />" || echo "failed (can't remove $1)<br />"
+			else
+				echo "nothing to do ($1 not found)<br />"
+			fi
+			shift
+		done
+	;;
+	touch_icons_flag)
+		while [ $1 ]; do
+			if [ ! -e $1 ]; then
+				touch $1 && echo "ok ($1 created)<br />" || echo "failed (can't create $1)<br />"
+			else
+				echo "nothing to do ($1 always exist)<br />"
+			fi
+			shift
+		done
+	;;
+	read_icons_flag)
+		test -z $1 && exit 1
+		test -e $1 && S=$(cat $1)
+		printf "%s" "$S"
+	;;
+
+	# plugins
+	p_fcm_start)		%(PRIVATE_HTTPDDIR)/scripts/Y_Plugins.sh fcm_start;;
+	p_fcm_stop)		%(PRIVATE_HTTPDDIR)/scripts/Y_Plugins.sh fcm_stop;;
+	p_nfs_start)		%(PRIVATE_HTTPDDIR)/scripts/Y_Plugins.sh nfs_start;;
+	p_nfs_stop)		%(PRIVATE_HTTPDDIR)/scripts/Y_Plugins.sh nfs_stop;;
+	p_samba_start)		%(PRIVATE_HTTPDDIR)/scripts/Y_Plugins.sh samba_start;;
+	p_samba_stop)		%(PRIVATE_HTTPDDIR)/scripts/Y_Plugins.sh samba_stop;;
+	p_tuxcald_start)	%(PRIVATE_HTTPDDIR)/scripts/Y_Plugins.sh tuxcald_start;;
+	p_tuxcald_stop)		%(PRIVATE_HTTPDDIR)/scripts/Y_Plugins.sh tuxcald_stop;;
+	p_tuxmaild_start)	%(PRIVATE_HTTPDDIR)/scripts/Y_Plugins.sh tuxmaild_start;;
+	p_tuxmaild_stop)	%(PRIVATE_HTTPDDIR)/scripts/Y_Plugins.sh tuxmaild_stop;;
+	p_inadyn_start)		%(PRIVATE_HTTPDDIR)/scripts/Y_Plugins.sh inadyn_start;;
+	p_inadyn_stop)		%(PRIVATE_HTTPDDIR)/scripts/Y_Plugins.sh inadyn_stop;;
+	p_dropbear_start)	%(PRIVATE_HTTPDDIR)/scripts/Y_Plugins.sh dropbear_start;;
+	p_dropbear_stop)	%(PRIVATE_HTTPDDIR)/scripts/Y_Plugins.sh dropbear_stop;;
+	p_ushare_start)		%(PRIVATE_HTTPDDIR)/scripts/Y_Plugins.sh ushare_start;;
+	p_ushare_stop)		%(PRIVATE_HTTPDDIR)/scripts/Y_Plugins.sh ushare_stop;;
+	p_djmount_start)	%(PRIVATE_HTTPDDIR)/scripts/Y_Plugins.sh djmount_start;;
+	p_djmount_stop)		%(PRIVATE_HTTPDDIR)/scripts/Y_Plugins.sh djmount_stop;;
+	p_minidlna_start)	%(PRIVATE_HTTPDDIR)/scripts/Y_Plugins.sh minidlna_start;;
+	p_minidlna_stop)	%(PRIVATE_HTTPDDIR)/scripts/Y_Plugins.sh minidlna_stop;;
+	p_xupnpd_start)		%(PRIVATE_HTTPDDIR)/scripts/Y_Plugins.sh xupnpd_start;;
+	p_xupnpd_stop)		%(PRIVATE_HTTPDDIR)/scripts/Y_Plugins.sh xupnpd_stop;;
+	p_crond_start)		%(PRIVATE_HTTPDDIR)/scripts/Y_Plugins.sh crond_start;;
+	p_crond_stop)		%(PRIVATE_HTTPDDIR)/scripts/Y_Plugins.sh crond_stop;;
+
+	# plugins show/hide
+	p_show)
+		PLUGIN=$1
+		for PLUGIN_DIR in $PLUGIN_DIRS
+		do
+			cd $PLUGIN_DIR
+			test -w "$PLUGIN" || continue
+			echo "[$BNAME] modifying $PLUGIN_DIR/$PLUGIN"
+			sed -i "s/^\(hide=\).*$/\1"0"/" $PLUGIN
+		done
+	;;
+	p_hide)
+		PLUGIN=$1
+		for PLUGIN_DIR in $PLUGIN_DIRS
+		do
+			cd $PLUGIN_DIR
+			test -w "$PLUGIN" || continue
+			echo "[$BNAME] modifying $PLUGIN_DIR/$PLUGIN"
+			# fix for missing trailing linefeed in cfg-file
+			test "$(tail -c1 $PLUGIN)" != "" && echo "" >> $PLUGIN
+			if grep -q "^hide=" $PLUGIN
+			then
+				sed -i "s/^\(hide=\).*$/\1"1"/" $PLUGIN
+			else
+				echo "hide=1" >> $PLUGIN
+			fi
+		done
+	;;
+	p_list)
+		getLanguage
+		if [ "$Y_LANG" == "Deutsch" ]
+		then
+			Y_L_show="Anzeigen"
+			Y_L_hide="Verstecken"
+		else
+			Y_L_show="Show"
+			Y_L_hide="Hide"
+		fi
+		for PLUGIN_DIR in $PLUGIN_DIRS
+		do
+			test -e $PLUGIN_DIR || continue
+			cd $PLUGIN_DIR
+			PLUGINS=$(ls -1 *.cfg 2>/dev/null)
+			for PLUGIN in $PLUGINS
+			do
+				if [ "$1" == "lua" ]
+				then
+					# lua-plugins don't need the executable flag
+					test -e ${PLUGIN%%.*}.${1} || continue
+				else
+					test -x ${PLUGIN%%.*}.${1} || continue
+				fi
+				NAME=$(cat $PLUGIN | grep "^name=" | cut -d= -f2)
+				HIDE=$(cat $PLUGIN | grep "^hide=" | cut -d= -f2)
+				case $HIDE in
+					1)
+						IMG="<img src='images/x_red.png' class='status'>"
+						INP="<input type='button' value='$Y_L_show' onclick='Y_Tools(\"p_show $PLUGIN\", 1000);' />"
+					;;
+					*)
+						IMG="<img src='images/check_green.png' class='status'>"
+						INP="<input type='button' value='$Y_L_hide' onclick='Y_Tools(\"p_hide $PLUGIN\", 1000);' />"
+					;;
+				esac
+cat << eoPLUGIN
+			<!-- $NAME -->
+			<tr class="list">
+				<td>
+					$IMG
+					<span title="$PLUGIN_DIR/${PLUGIN%%.*}.${1}">
+						$NAME
+					</span>
+				</td>
+				<td>
+					$INP
+				</td>
+			</tr>
+eoPLUGIN
+			done
+		done
+	;;
 	*)
-		echo "[Y_Tools.sh] Parameter wrong: $*" ;;
+		echo "[$BNAME] Parameter wrong: $action $*"
+	;;
 esac