* Refactoring HTTPD/TELNET - move command usage (MODUL TELNET now none essential )

* Some little fixes

3 files changed, 18 insertions, 15 deletions

diff --git a/html/bloecke/percentbar.tmpl b/html/bloecke/percentbar.tmpl
index f8b17fe..16ebaab 100644
--- a/html/bloecke/percentbar.tmpl
+++ b/html/bloecke/percentbar.tmpl
@@ -9,13 +9,13 @@
      %?>
 
 <div align="center" style='position:absolute'>
-    <img src="<?% ground %?>" width="<?% barwidth %?>" title='<?% percent | format "%02d" %?>%'>
-    <div style='position:absolute; top:0px; left:0px; clip:rect(0px, <?% percent * barexp  | format "%d" %?>px, <?% percent * barexp | format "%d" %?>px, 0px)'>
-    <img src="<?% over %?>" width="<?% barwidth %?>" title='<?% percent | format "%02d" %?>%'>
+    <img src="<?% ground %?>" width="<?% barwidth %?>" title='<?% percent div 1 | format "%02d" %?>%'>
+    <div style='position:absolute; top:0px; left:0px; clip:rect(0px, <?% ( percent * barexp ) div 1 %?>px, <?% ( percent * barexp ) div 1 %?>px, 0px)'>
+    <img src="<?% over %?>" width="<?% barwidth %?>" title='<?% percent div 1 | format "%02d" %?>%'>
     </div>
     <?% IF barwidth > 200 %?>
     <div style='position:absolute; top:10px; left:<?% barwidth - 70 %?>px; color:#FFFFFF;font-weight:bold'>
-    <?% percent | format "%02d" %?>%
+    <?% percent div 1 | format "%02d" %?>%
     </div>
     <?% END %?>
 </div>
diff --git a/html/now.tmpl b/html/now.tmpl
index 795fc9e..e124a67 100644
--- a/html/now.tmpl
+++ b/html/now.tmpl
@@ -86,9 +86,9 @@
                 <td><?% IF param.timers.${id} && param.timers.${id}.Status %?><b><?% END %?><?% stop %?><?% IF param.timers.${id} && param.timers.${id}.Status %?></b><?% END %?></td>
                 <?% UNLESS duration > 100 OR duration <= 0 %?>
                 <td width="100" valign='bottom'><nobr>
-                    <?% per = (100 - duration) + 0.999 | format('%d'); per = (per > 100 ? 100 : per)  %?>
+                    <?% per = ( (100 - duration) + 0.999 ) div 1 ; per = (per > 100 ? 100 : per)  %?>
                     <?% per2 = 100 - per %?>
-                    <?% text = per | format("<br><font size='1'>${per}%%</font>") %?>
+                    <?% text = per div 1 | format("<br><font size='1'>${per}%%</font>") %?>
                     <table width="100%" cellspacing='0' cellpadding='0'>
                         <tr>
                         <td bgcolor="#dedede"><img src='images/blank.png' width="<?% per %?>" height='1' hspace=0 vspace=0><?% IF param.timers.${id} && param.timers.${id}.Status %?><b><?% END %?><?% (per > 19 ? text : "&nbsp;") %?></td>
diff --git a/html/schema.tmpl b/html/schema.tmpl
index 38ad6d6..5869c4e 100644
--- a/html/schema.tmpl
+++ b/html/schema.tmpl
@@ -21,7 +21,10 @@ Duration = param.zeitbis - param.zeitvon;
 
 <form>
 <h1><?% gettext("What is running at") %?>&nbsp;<?% day %?><br/>
-<?% gettext('Display') %?>&nbsp;<?% gettext('from') %?>&nbsp;<?% date.format(param.zeitvon, '%H:%M', locale) %?>&nbsp;<?% gettext('to') %?>&nbsp;<?% date.format(param.zeitbis, '%H:%M', locale) %?>&nbsp;<?% gettext("o'clock") %?>
+<?% gettext('Display') %?>&nbsp;
+<?% gettext('from') %?>&nbsp;<?% date.format(param.zeitvon, '%H:%M', locale) %?>&nbsp;
+<?% gettext('to') %?>&nbsp;<?% date.format(param.zeitbis, '%H:%M', locale) %?>&nbsp;
+<?% gettext("o'clock") %?>
 </h1>
 
 <!-- TableTemplate -->
@@ -42,7 +45,7 @@ Duration = param.zeitbis - param.zeitvon;
              colspan = colspan + 1;
              zeit = param.zeitvon + c;
         -%?>
-    <td bgcolor="white" width="<?% offset = (c % 3600 ? 1 : 2);(percent - offset) | format('%d') %?>" align='right'>
+    <td bgcolor="white" width="<?% offset = (c % 3600 ? 1 : 2);(percent - offset) div 1 %?>" align='right'>
         <?% IF c == abstand && zeit > date.now %?>
         &nbsp;<a href='?cmd=schema&amp;data=<?% (param.zeitvon - Duration) %?>&amp;__cgrp=<?% param.channelgroup %?>'><</a>
         <?% END %?>
@@ -64,10 +67,10 @@ Duration = param.zeitbis - param.zeitvon;
             p = (a / Duration) * width;
          %?>
         <div style="position:absolute; z-index:1">
-            <div style="position:relative; top:0px; left:0px; width:<?% p | format('%d') %?>px; height:10px; z-index:2; border:thin solid #804000; background-color:#FF0000; text-align: right; -moz-opacity:0.2; filter:Alpha(opacity=20)"><font size="1">&nbsp;</font></div>
+            <div style="position:relative; top:0px; left:0px; width:<?% p div 1 %?>px; height:10px; z-index:2; border:thin solid #804000; background-color:#FF0000; text-align: right; -moz-opacity:0.2; filter:Alpha(opacity=20)"><font size="1">&nbsp;</font></div>
         </div>
         <div style="position:absolute; z-index:1">
-            <div style="position:relative; top:0px; left:<?% p | format('%d') %?>px; width:1px; height:100%; border-left:1px solid red; margin:0px; z-Index: 2;"><img alt="" src='images/blank.png' width='1' height='<?% data.keys.size * 23 %?>' border="0" hspace="0" vspace="0" /></div>
+            <div style="position:relative; top:0px; left:<?% p div 1 %?>px; width:1px; height:100%; border-left:1px solid red; margin:0px; z-Index: 2;"><img alt="" src='images/blank.png' width='1' height='<?% data.keys.size * 23 %?>' border="0" hspace="0" vspace="0" /></div>
         </div>
         <?%- END -%?>
         <?%- WHILE c < Duration;
@@ -75,7 +78,7 @@ Duration = param.zeitbis - param.zeitvon;
              percent = (abstand / Duration) * width
         -%?><img alt="" style="background:white" src='images/blank.png' width="<?%-
             offset = (c % 3600 ? 1 : 2);
-            (percent - offset) | format('%d')
+            (percent - offset) div 1
         -%?>" height='10' /><img alt=""
             style="background:<?% c % 900 ? "gray" : "black" %?>"
             src='images/blank.png'
@@ -119,7 +122,7 @@ Duration = param.zeitbis - param.zeitvon;
                     percent = (laenge / Duration) * width;
                     ges = ges + percent;
         -%?>
-        <img alt="" src='images/blank.png' width='<?% percent | format('%d') %?>' height=8 border=0 align='left' />
+        <img alt="" src='images/blank.png' width='<?% percent div 1 %?>' height=8 border=0 align='left' />
                 <?% END;
                 IF second_start < oldend;
                     dur = second_stop - oldend;
@@ -132,7 +135,7 @@ Duration = param.zeitbis - param.zeitvon;
                     percent = width - ges;
                 END;
                 ges = ges + percent;
-                trun = percent / 10 | format('%d');
+                trun = ( percent / 10 ) div 1;
                 IF dur < 300;
                     trun = 3;
 
@@ -140,9 +143,9 @@ Duration = param.zeitbis - param.zeitvon;
                 -%?>
         <?% d=[epgStart, " - ", epgStop ,"<br />", epgDesc ];desc=d.join("") %?>
 <?% IF trun <= 3 %?>
-        <?% INCLUDE bloecke/tooltip.tmpl cmd="display" title=epgTitle subtitle=epgSubTitle eventid=epgId linkid=epgId ttp_offset=-200 %?><img alt="" src='images/blank.png' width='<?% percent | format('%d') %?>' height=8 border=0 hspace=0 vspace=0 align='left' /></a>
+        <?% INCLUDE bloecke/tooltip.tmpl cmd="display" title=epgTitle subtitle=epgSubTitle eventid=epgId linkid=epgId ttp_offset=-200 %?><img alt="" src='images/blank.png' width='<?% percent div 1 %?>' height=8 border=0 hspace=0 vspace=0 align='left' /></a>
 <?% ELSE %?>
-        <table class='<?% PROCESS getStatus e=event t=param.timers r=param.runningTimer %?>' align="left" width="<?% percent | format('%d') %?>" cellpadding="0" cellspacing="0"><tr><td>
+        <table class='<?% PROCESS getStatus e=event t=param.timers r=param.runningTimer %?>' align="left" width="<?% percent div 1 %?>" cellpadding="0" cellspacing="0"><tr><td>
         <?% INCLUDE bloecke/tooltip.tmpl cmd="display" title=epgTitle subtitle=epgSubTitle eventid=epgId linkid=epgId ttp_offset=-200 %?>
         <?% chop(epgTitle,trun) %?></a></td></tr></table>
 <?% END %?>