Use default FOREACH syntax #1355

17 files changed, 33 insertions, 33 deletions

diff --git a/skins/html/widgets/checkbox.tmpl b/skins/html/widgets/checkbox.tmpl
index 631db79..a3b09d3 100644
--- a/skins/html/widgets/checkbox.tmpl
+++ b/skins/html/widgets/checkbox.tmpl
@@ -7,9 +7,9 @@
         <?% val = cgi.param(data.NAME) || data.def %?>
         <table style="border:0px solid #000000;"><tr>
         <?% c = 0 %?>
-        <?% FOREACH wert = data.choices %?>
+        <?% FOREACH wert IN data.choices %?>
             <?% "</tr><tr>" IF (c mod 3) == 0 %?>
-            <td><input type="checkbox" name="<?% data.NAME %?>" value="<?% wert %?>" <?% "checked" IF val.grep("^${wert}").size %?> <?% FOREACH p = param.tags; "$p ";END %?>><?% wert %?></td>
+            <td><input type="checkbox" name="<?% data.NAME %?>" value="<?% wert %?>" <?% "checked" IF val.grep("^${wert}").size %?> <?% FOREACH p IN param.tags; "$p ";END %?>><?% wert %?></td>
             <?% c = c + 1 %?>
         <?% END %?>
         </tr></table>
diff --git a/skins/html/widgets/date.tmpl b/skins/html/widgets/date.tmpl
index 565d3f2..67a3dde 100644
--- a/skins/html/widgets/date.tmpl
+++ b/skins/html/widgets/date.tmpl
@@ -22,9 +22,9 @@ function ch_input (checkbox, input) {
     </td>
     <td class="<?% (param.count mod 2) == 0 ? 'light' : 'dark' %?>" >
         <?% val = cgi.param(data.NAME) || data.def %?>
-        <input type="text" name="<?% data.NAME %?>" value="<?% val %?>" <?% FOREACH p = param.tags; "$p ";END %?>><br/>
+        <input type="text" name="<?% data.NAME %?>" value="<?% val %?>" <?% FOREACH p IN param.tags; "$p ";END %?>><br/>
         <?% valarr = val.split(''); z = 0 %?>
-        <?% FOREACH dd = gettext('Mon Tue Wed Thu Fri Sat Sun').split(' ') %?>
+        <?% FOREACH dd IN gettext('Mon Tue Wed Thu Fri Sat Sun').split(' ') %?>
         <input type="checkbox" name="Weekday" <?% "checked" IF ! val.search('^\d+') && valarr.$z != '-' %?> onchange='ch_input(this.form.Weekday, this.form.<?% data.NAME %?>)'><?% dd %?>
         <?% z = z + 1;
         END %?>
diff --git a/skins/html/widgets/dir.tmpl b/skins/html/widgets/dir.tmpl
index fa41e1b..881d8fd 100644
--- a/skins/html/widgets/dir.tmpl
+++ b/skins/html/widgets/dir.tmpl
@@ -5,7 +5,7 @@
     </td>
     <td class="<?% (param.count mod 2) == 0 ? 'light' : 'dark' %?>" >
         <?% val = cgi.param(data.NAME) || data.def %?>
-        <input type="text" name="<?% data.NAME %?>" value="<?% val %?>" <?% FOREACH p = param.tags; "$p ";END %?>
+        <input type="text" name="<?% data.NAME %?>" value="<?% val %?>" <?% FOREACH p IN param.tags; "$p ";END %?>
             onBlur="check<?% data.NAME %?>Dir()"><br>
         <span id='id<?% param.count %?>'></span>
     </td>
diff --git a/skins/html/widgets/file.tmpl b/skins/html/widgets/file.tmpl
index 2c41fe4..cbc7c85 100644
--- a/skins/html/widgets/file.tmpl
+++ b/skins/html/widgets/file.tmpl
@@ -5,7 +5,7 @@
     </td>
     <td class="<?% (param.count mod 2) == 0 ? 'light' : 'dark' %?>" >
         <?% val = cgi.param(data.NAME) || data.def %?>
-            <input type="text" name="<?% data.NAME %?>" value="<?% val %?>" <?% FOREACH p = param.tags; "$p ";END %?>
+            <input type="text" name="<?% data.NAME %?>" value="<?% val %?>" <?% FOREACH p IN param.tags; "$p ";END %?>
                 onBlur="check<?% data.NAME %?>File()"><br>
             <span id='id<?% param.count %?>'></span>
     </td>
diff --git a/skins/html/widgets/footer.tmpl b/skins/html/widgets/footer.tmpl
index 35ccff1..d6e914b 100644
--- a/skins/html/widgets/footer.tmpl
+++ b/skins/html/widgets/footer.tmpl
@@ -8,7 +8,7 @@
 		<h2 class="tab">Last Logs</h2>
 
 		<table>
-        <?% FOREACH logline = llog(5) %?>
+        <?% FOREACH logline IN llog(5) %?>
         <tr><td>
             <div style='font-size:10px'><?% logline %?><br></div>
         </td></tr>
@@ -20,7 +20,7 @@
 	<div class="tab-page" id="tabPage2">
 		<h2 class="tab">Benchmark</h2>
             <table width=100%>
-                <?% FOREACH n = data.keys.sort %?>
+                <?% FOREACH n IN data.keys.sort %?>
                     <?% NEXT IF data.$n > 1000 %?>
                     <?% ges = data.$n + ges %?>
                 <tr>
diff --git a/skins/html/widgets/host.tmpl b/skins/html/widgets/host.tmpl
index cf90c8a..0a3d11a 100644
--- a/skins/html/widgets/host.tmpl
+++ b/skins/html/widgets/host.tmpl
@@ -9,7 +9,7 @@
             type="text"
             name="<?% data.NAME %?>"
             value="<?% val %?>"
-            <?% FOREACH p = param.tags; "$p ";END %?>
+            <?% FOREACH p IN param.tags; "$p ";END %?>
             onBlur="check<?% data.NAME %?>Host()"
         ><br/>
         <span id='id<?% param.count %?>'></span>
diff --git a/skins/html/widgets/integer.tmpl b/skins/html/widgets/integer.tmpl
index bbde2c3..315f86c 100644
--- a/skins/html/widgets/integer.tmpl
+++ b/skins/html/widgets/integer.tmpl
@@ -4,6 +4,6 @@
         <?% data.msg %?>
     </td>
     <td class="<?% (param.count mod 2) == 0 ? 'light' : 'dark' %?>" >
-        <input type="text" name="<?% data.NAME %?>" value="<?% cgi.param(data.NAME) || data.def %?>" <?% FOREACH p = param.tags; "$p ";END %?>>
+        <input type="text" name="<?% data.NAME %?>" value="<?% cgi.param(data.NAME) || data.def %?>" <?% FOREACH p IN param.tags; "$p ";END %?>>
     </td>
 </tr>
diff --git a/skins/html/widgets/list.tmpl b/skins/html/widgets/list.tmpl
index a4bdcf2..a535f08 100644
--- a/skins/html/widgets/list.tmpl
+++ b/skins/html/widgets/list.tmpl
@@ -11,19 +11,19 @@
             <?% values = val %?>
         <?% END %?>
         <?% IF data.options == 'multi' %?>
-            <select name="<?% data.NAME %?>" multiple size="10" <?% FOREACH p = param.tags; "$p ";END %?>>
+            <select name="<?% data.NAME %?>" multiple size="10" <?% FOREACH p IN param.tags; "$p ";END %?>>
         <?% ELSE %?>
-            <select name="<?% data.NAME %?>" <?% FOREACH p = param.tags; "$p ";END %?>>
+            <select name="<?% data.NAME %?>" <?% FOREACH p IN param.tags; "$p ";END %?>>
         <?% END %?>
-            <?% FOREACH l = data.choices %?>
+            <?% FOREACH l IN data.choices %?>
                 <?% sel = '' %?>
                 <?% dis = '' %?>
-                <?% FOREACH valch = values %?>
+                <?% FOREACH valch IN values %?>
 					          <?% IF valch == l.1 %?>
                     <?% sel = ' selected="selected"';LAST %?>
                     <?% END %?>
                 <?% END %?>
-                <?% FOREACH valch = data.disabled %?>
+                <?% FOREACH valch IN data.disabled %?>
 					          <?% IF valch == l.1 %?>
                     <?% dis = ' disabled="disabled"';LAST %?>
                     <?% END %?>
diff --git a/skins/html/widgets/littlemenu.tmpl b/skins/html/widgets/littlemenu.tmpl
index 8ae191f..8cacdfe 100644
--- a/skins/html/widgets/littlemenu.tmpl
+++ b/skins/html/widgets/littlemenu.tmpl
@@ -4,7 +4,7 @@
 <h1><?% data.title %?></h1>
 <?% END %?>
 
-<?% FOREACH l = data.links %?>
+<?% FOREACH l IN data.links %?>
 <?% "<b>" IF data.highlight == l.key %?>
 <a href="<?% l.value.link %?>">[<?% l.value.text %?>]</a>&nbsp;
 <?% "</b>" IF data.highlight == l.key %?>
diff --git a/skins/html/widgets/menu.tmpl b/skins/html/widgets/menu.tmpl
index 41bfc5f..1aaef6f 100644
--- a/skins/html/widgets/menu.tmpl
+++ b/skins/html/widgets/menu.tmpl
@@ -5,7 +5,7 @@
 <?% END %?>
 
 <ul>
-<?% FOREACH field = data %?>
+<?% FOREACH field IN data %?>
     <?% group = field.0; short = field.1; name = field.2; descr = field.3 %?>
     <?% IF ! oldgroup.defined %?>
 <li><?% group %?><ul>
diff --git a/skins/html/widgets/password.tmpl b/skins/html/widgets/password.tmpl
index f6b043e..7a18927 100644
--- a/skins/html/widgets/password.tmpl
+++ b/skins/html/widgets/password.tmpl
@@ -5,7 +5,7 @@
     </td>
     <td class="<?% (param.count mod 2) == 0 ? 'light' : 'dark' %?>" >
         <?% val = cgi.param(data.NAME) || data.def %?>
-        <input type="password" name="<?% data.NAME %?>" value="" <?% FOREACH p = param.tags; "$p ";END %?>><br/>
-        <input type="password" name="<?% data.NAME %?>" value="" <?% FOREACH p = param.tags; "$p ";END %?> title='<?% gettext("Repeat entry") %?>'>
+        <input type="password" name="<?% data.NAME %?>" value="" <?% FOREACH p IN param.tags; "$p ";END %?>><br/>
+        <input type="password" name="<?% data.NAME %?>" value="" <?% FOREACH p IN param.tags; "$p ";END %?> title='<?% gettext("Repeat entry") %?>'>
     </td>
 </tr>
diff --git a/skins/html/widgets/radio.tmpl b/skins/html/widgets/radio.tmpl
index acd42f5..afe953c 100644
--- a/skins/html/widgets/radio.tmpl
+++ b/skins/html/widgets/radio.tmpl
@@ -5,8 +5,8 @@
     </td>
     <td class="<?% (param.count mod 2) == 0 ? 'light' : 'dark' %?>" >
         <?% val = cgi.param(data.NAME) || data.def %?>
-        <?% FOREACH wert = data.choices %?>
-            <input type="radio" name="<?% data.NAME %?>" value="<?% wert %?>" <?% "checked" IF val == wert %?><?% FOREACH p = param.tags; " $p";END %?>><?% wert %?><br>
+        <?% FOREACH wert IN data.choices %?>
+            <input type="radio" name="<?% data.NAME %?>" value="<?% wert %?>" <?% "checked" IF val == wert %?><?% FOREACH p IN param.tags; " $p";END %?>><?% wert %?><br>
         <?% END %?>
     </td>
 </tr>
diff --git a/skins/html/widgets/remote.tmpl b/skins/html/widgets/remote.tmpl
index 3204c74..33772af 100644
--- a/skins/html/widgets/remote.tmpl
+++ b/skins/html/widgets/remote.tmpl
@@ -127,7 +127,7 @@ aktiv = window.setInterval("grab()", inter);
 <tr>
   <td colspan="3" align="center">
       <select style="width:150px;" name="vdr">
-      <?% FOREACH l = param.vdrlist %?>
+      <?% FOREACH l IN param.vdrlist %?>
           <option value='<?% l.1 %?>'<?% IF l.1 == param.vdr %?> selected<?% END %?>><?% l.0 %?></option>
       <?% END %?>
       </select>
@@ -143,7 +143,7 @@ aktiv = window.setInterval("grab()", inter);
 <tr>
   <td colspan="3" align="center">
       <select style="width:150px;" name="channels" onchange="post('?cmd=switch&amp;data='+ this.form.channels.options[this.form.channels.options.selectedIndex].value)">
-      <?% FOREACH l = param.channels %?>
+      <?% FOREACH l IN param.channels %?>
       <?% IF l.2 && l.2 != optgroup %?>
         <?% IF optgroup %?>
         </optgroup>
diff --git a/skins/html/widgets/string.tmpl b/skins/html/widgets/string.tmpl
index 3faf4f4..b3dc89f 100644
--- a/skins/html/widgets/string.tmpl
+++ b/skins/html/widgets/string.tmpl
@@ -6,11 +6,11 @@
     <td class="<?% (param.count mod 2) == 0 ? 'light' : 'dark' %?>" >
         <?% val = cgi.param(data.NAME) || data.def %?>
         <?% IF data.readonly %?>
-        <span<?% FOREACH p = param.tags; "$p ";END %?>>
+        <span<?% FOREACH p IN param.tags; "$p ";END %?>>
         <?% val %?>
         </span>
         <?% ELSE %?>
-        <input type="text" name="<?% data.NAME %?>" value="<?% val %?>" <?% FOREACH p = param.tags; "$p ";END %?>>
+        <input type="text" name="<?% data.NAME %?>" value="<?% val %?>" <?% FOREACH p IN param.tags; "$p ";END %?>>
         <?% END %?>
     </td>
 </tr>
diff --git a/skins/html/widgets/table.tmpl b/skins/html/widgets/table.tmpl
index 01d1303..75b7250 100644
--- a/skins/html/widgets/table.tmpl
+++ b/skins/html/widgets/table.tmpl
@@ -8,7 +8,7 @@
     <?% IF ! param.hide_HeadRow %?>
     <th width="1%">Name</th><th>Value</th>
     <?% END %?>
-    <?% FOREACH name = data.keys.sort %?>
+    <?% FOREACH name IN data.keys.sort %?>
     <?% NEXT IF name.match('^__') %?>
     <tr>
         <td width="50%"><?% name %?></td><td><?% data.$name %?></td>
@@ -17,7 +17,7 @@
 <?% ELSE %?>
     <?% fields = data.shift %?>
         <tr>
-        <?% FOREACH field = fields %?>
+        <?% FOREACH field IN fields %?>
             <?% NEXT IF field.match('^__') %?>
             <th>
                 <nobr><?% field %?>
@@ -29,10 +29,10 @@
             </th>
         <?% END %?>
         </tr>
-        <?% FOREACH zeile = data %?>
+        <?% FOREACH zeile IN data %?>
         <tr>
             <?% c = -1 %?>
-            <?% FOREACH field = zeile %?>
+            <?% FOREACH field IN zeile %?>
                 <?% c = c + 1 %?>
                 <?% NEXT IF fields.$c.match('^__') %?>
                 <td><?% field %?></td>
diff --git a/skins/html/widgets/textfield.tmpl b/skins/html/widgets/textfield.tmpl
index 5ab4e7e..c2bc961 100644
--- a/skins/html/widgets/textfield.tmpl
+++ b/skins/html/widgets/textfield.tmpl
@@ -6,11 +6,11 @@
     <td class="<?% (param.count mod 2) == 0 ? 'light' : 'dark' %?>" >
         <?% val = cgi.param(data.NAME) || data.def %?>
         <?% IF data.readonly %?>
-        <span<?% FOREACH p = param.tags; "$p ";END %?>>
+        <span<?% FOREACH p IN param.tags; "$p ";END %?>>
         <?% val %?>
         </span>
         <?% ELSE %?>
-            <textarea cols='50' rows='5' name="<?% data.NAME %?>" <?% FOREACH p = param.tags; "$p ";END %?>><?%  val | replace("<br />","
+            <textarea cols='50' rows='5' name="<?% data.NAME %?>" <?% FOREACH p IN param.tags; "$p ";END %?>><?%  val | replace("<br />","
 ") %?></textarea>
         <?% END %?>
     </td>
diff --git a/skins/html/widgets/time.tmpl b/skins/html/widgets/time.tmpl
index 5519c0c..1ed37f0 100644
--- a/skins/html/widgets/time.tmpl
+++ b/skins/html/widgets/time.tmpl
@@ -6,11 +6,11 @@
     <td class="<?% (param.count mod 2) == 0 ? 'light' : 'dark' %?>" >
         <?% val = cgi.param(data.NAME) || data.def %?>
         <?% IF data.readonly %?>
-        <span<?% FOREACH p = param.tags; "$p ";END %?>>
+        <span<?% FOREACH p IN param.tags; "$p ";END %?>>
         <?% val %?>
         </span>
         <?% ELSE %?>
-        <input type="text" name="<?% data.NAME %?>" value="<?% val %?>" <?% FOREACH p = param.tags; "$p ";END %?>>
+        <input type="text" name="<?% data.NAME %?>" value="<?% val %?>" <?% FOREACH p IN param.tags; "$p ";END %?>>
         <?% END %?>
     </td>
 </tr>