2009-12-30: 3.6.5v3.6.5

- Changed: use HTTP::Date for HTTP date/time formatting (Ville Skyttä).
- Improved: Create fewer SVDRP connections (Ville Skyttä).
- Fixed: some jslint warnings in javascript files (Ville Skyttä).
- Improved: Config file read/write error handling (Ville Skyttä).
- Improved: Send Last-Modified header for static resources (Ville Skyttä).
- Added: "-l" and "--log" parameter.
- Changed: "-nf" option to "-n".
- Changed: Logging.
- Added: "--ssl" switch to accept https instead of http.
- Added: Find VDR 1.7.2+ TS recordings.
- Updated: Italian translation (Submitted by Diego Pierotto).
- Fixed: epgsearch uses seconds in aux field of timers, not minutes (Reported by Rincewind99 @vdr-portal.de).
- Fix bug #507 "EPGsearch custom categories no longer show".
- Fixed: Saving the config showed error message "1".
- Reworked: Spanish translation (Submitted by Manuel Gomez).
- Fixed: failing check whether the process with our pid is a vdradmind (Ville Skyttä)
- Fixed: always exit with status 1 from --kill if no processes were killed (Ville Skyttä)
- Improved: pid file error handling (Ville Skyttä)
- Added: autotimer schedule change tracking option in UI (Ville Skyttä)
- Fixed: use text/javascript for JavaScript in HTTP headers (Ville Skyttä)
- Updated: required Perl module documentation (Ville Skyttä)
- Improved: template caching options (stat ttl, default cache dir is now /var/cache/vdradmin) (Ville Skyttä)
- Improved: error message when binding the server socket fails (Ville Skyttä)
- Improved: warn if log file cannot be written to (Ville Skyttä)
- Fixed: don't try to delete pid file in non-daemon mode.
- Improved: include reason in pid file deletion error message (Ville Skyttä).
- Added: ability to log to syslog ("LOGFILE = syslog" in config) (Ville Skyttä).
- Changed: non-daemon mode (-nf) always turns on logging to stderr (Ville Skyttä).

1 files changed, 191 insertions, 180 deletions

diff --git a/template/default/timeline.js b/template/default/timeline.js
index 72a654b..8f6053e 100644
--- a/template/default/timeline.js
+++ b/template/default/timeline.js
@@ -1,33 +1,35 @@
+/*jslint browser: true, evil: true, laxbreak: true */

+

 /*##########################################################################*/

 /* Browser independent size detection                                       */

 /*##########################################################################*/

-function GetWindowW() 

+function GetWindowW()

 {

-   if (window.innerWidth) 

+   if (window.innerWidth)

    {

       return window.innerWidth;

-   } 

-   else if (document.body && document.body.offsetWidth) 

+   }

+   else if (document.body && document.body.offsetWidth)

    {

       return document.body.offsetWidth;

-   } 

-   else 

+   }

+   else

    {

       return 0;

    }

 }

 

-function GetWindowH() 

+function GetWindowH()

 {

-   if (window.innerHeight) 

+   if (window.innerHeight)

    {

       return window.innerHeight;

-   } 

-   else if (document.body && document.body.offsetHeight) 

+   }

+   else if (document.body && document.body.offsetHeight)

    {

       return document.body.offsetHeight;

-   } 

-   else 

+   }

+   else

    {

       return 0;

    }

@@ -62,6 +64,18 @@ function ChannelInfo(vdr_id, name, url, events)
    this.events = events;

 }

 

+function format_date(fmt, time)

+{

+   if (fmt == "%H:%M")

+   {

+      var date = new Date(time * 1000);

+      var h = '0' + date.getHours();

+      var m = '0' + date.getMinutes();

+      return h.substr(h.length-2, 2) + ':' + m.substr(m.length-2, 2);

+   }

+   return "[WRONG_FMT:" + fmt + "]";

+}

+

 function EPGEvent(epg_id, start_sec, stop_sec, title, timer, summary)

 {

    this.epg_id = epg_id;

@@ -74,27 +88,12 @@ function EPGEvent(epg_id, start_sec, stop_sec, title, timer, summary)
    this.summary = summary;

 }

 

-function format_date(fmt, time)

-{	

-   var date = new Date(time * 1000);

-   switch (fmt)

-   {

-      case "%H:%M":

-      {

-         var h = '0' + date.getHours();

-         var m = '0' + date.getMinutes();

-         return h.substr(h.length-2, 2) + ':' + m.substr(m.length-2, 2);

-      }

-   }

-   return "[WRONG_FMT:" + fmt + "]";

-}

-

 function SetTimeLine(_this, _table_w, _px_per_min, _end_min)

 {

    _this.name_w = 100;

    _this.table_w = _table_w;

    _this.px_per_min = _px_per_min;

-   

+

    _this.end_min = Div(_this.table_w - _this.name_w, _this.px_per_min);

    if (_this.end_min > _end_min)

    {

@@ -104,9 +103,9 @@ function SetTimeLine(_this, _table_w, _px_per_min, _end_min)
    _this.end_min -= _this.end_min % 30;

    _this.event_w = _this.end_min * _this.px_per_min;

    _this.name_w = _this.table_w - _this.event_w;

-   

+

    _this.end_sec = _this.start_sec + _this.end_min * 60;

-   

+

    _this.first_sec = _this.now_sec + 1799 - _this.end_min * 60;

    _this.first_sec -= _this.first_sec % 1800;

    _this.last_sec = _this.first_sec + 86400;

@@ -117,11 +116,11 @@ function TimeLine(_req_sec, _now_url, _px_per_min, _end_min)
    this.now_url = _now_url;

    this.org_px_per_min = _px_per_min;

    this.org_end_min = _end_min;

-   

+

    this.req_sec = _req_sec;

    this.start_sec = _req_sec - _req_sec % 1800;

    this.min5_h = 10;

-   

+

    var d = new Date();

    this.now_sec = Div(d.getTime(), 1000);

 

@@ -157,69 +156,26 @@ function BuildHiddenFrameInput()
    W('<input type="hidden" name="frame" value="' + tl.first_sec + '"/>');

 }

 

-function BuildContent()

-{

-   /* Write content div */

-   BuildContentDiv();

-   

-   /* Check if the width has changed due to vertical scrollbar */

-   var tab = document.getElementById("heading");

-   var table_w;

-   if (tab)

-   {

-      table_w = tab.clientWidth;

-   }

-   else

-   {

-      table_w = this.innerWidth;

-   }

-

-   if (tl.table_w > table_w)

-   {

-      /* Recalculate all data for new table width */

-      SetTimeLine(tl, table_w, tl.org_px_per_min, tl.org_end_min);

-

-      /* Delete first content div */

-      tab = document.getElementById("content");

-      tab.innerHTML = null;

-      

-      /* Write second content div */

-      BuildContentDiv();

-   }

-}

-

-function BuildContentDiv()

-{

-   W('<div id="content">');

-   

-      W('<table width="' + tl.table_w + '" border="0" cellspacing="0" cellpadding="0" class="bigtable list">');

-         BuildHeader();

-         BuildTable();

-      W('</table>');

-   

-      DrawTimeLine();

-   W('</div>');

-}

-

 function BuildHeader()

 {

    W('<tr class="heading">');

       W('<td id="header_title" colspan="3">');

          W('<h2>');

-            W(format_date('%H:%M', tl.start_sec) + '&nbsp;' + trans.o_clock 

-              + '&nbsp;' + trans.to + '&nbsp;' 

+            W(format_date('%H:%M', tl.start_sec) + '&nbsp;' + trans.o_clock

+              + '&nbsp;' + trans.to + '&nbsp;'

               + format_date('%H:%M', tl.end_sec) + '&nbsp;' + trans.o_clock);

          W('</h2>');

          W('<br />');

       W('</td>');

       W('<td id="header_navi" class="col_navi">');

+      var diff_sec;

       if (tl.start_sec < tl.first_sec + 1800)

       {

          W('<img src="bilder/pfeile_nachlinks_soft.png" border="0" />');

       }

       else

       {

-         var diff_sec = tl.start_sec - tl.end_min * 60;

+         diff_sec = tl.start_sec - tl.end_min * 60;

          if (diff_sec < tl.first_sec)

          {

             diff_sec = tl.first_sec;

@@ -234,7 +190,7 @@ function BuildHeader()
       }

       else

       {

-         var diff_sec = tl.end_sec;

+         diff_sec = tl.end_sec;

          W('<a href="' + tl.now_url + '&amp;time=' + format_date('%H:%M', diff_sec) + '&amp;frame=' + tl.first_sec + '" title="' + format_date('%H:%M', diff_sec) + '">');

             W('<img src="bilder/pfeile_nachrechts.png" border="0" />');

          W('</a>');

@@ -243,14 +199,29 @@ function BuildHeader()
    W('</tr>');

 }

 

-function BuildTable()

+function DrawTimeLine()

 {

-   W('<tr id="row_timeline" class="row_even">');

-      W('<td colspan="4">');

-         BuildTimeScale();

-         BuildProgTable();

-      W('</td>');

-   W('</tr>');

+   var tab = document.getElementById("row_timeline");

+   if (tab && (tl.start_sec <= tl.now_sec) && (tl.now_sec < tl.end_sec))

+   {

+      var x = tl.name_w + tl.px_per_min * Div(tl.now_sec - tl.start_sec, 60) + 1;

+      var y = tab.offsetTop;

+      var h = tab.offsetHeight;

+      var style = "position:absolute; "

+                + "top:" + y + "px; "

+                + "left:" + x + "px; "

+                + "width:1px; "

+                + "height:" + h + "px; "

+                + "z-index:2; ";

+      if (document.all)

+      {

+         style = style + "filter:Alpha(opacity=50); ";

+      }

+

+      W('<span id="timeline" style="' + style + '">');

+      W('   <img src="bilder/spacer.gif" width="1" height="1" border="0" />');

+      W('</span>');

+   }

 }

 

 function BuildTimeScale()

@@ -258,10 +229,12 @@ function BuildTimeScale()
    W('<table width="' + tl.table_w + '" border="0" cellspacing="0" cellpadding="0" class="timestable">');

       W('<tr>');

          W('<td><img src="bilder/spacer.gif" width="' + tl.name_w + '" height="1" border="0" /></td>');

+         var c;

+         var w;

          for (var min = 0; min < tl.end_min; min += 30)

          {

-            var c = min % 60 ? 'color1' : 'color2';

-            var w = tl.px_per_min * (tl.end_min - min < 30) ? tl.end_min - min : 30;

+            c = min % 60 ? 'color1' : 'color2';

+            w = tl.px_per_min * (tl.end_min - min < 30) ? tl.end_min - min : 30;

             var t = tl.start_sec + min * 60;

             W('<td colspan="6" class="' + c + '">');

                W('<img src="bilder/spacer.gif" width="' + w + '" height="1" border="0" /><br />');

@@ -271,10 +244,10 @@ function BuildTimeScale()
       W('</tr>');

       W('<tr>');

          W('<td><img src="bilder/spacer.gif" width="' + tl.name_w + '" height="1" border="0" /></td>');

-         for (var min = 0; min < tl.end_min; min += 5)

+         for (min = 0; min < tl.end_min; min += 5)

          {

-            var c = min % 10 ? 'color1' : 'color2';

-            var w = tl.px_per_min * 5;

+            c = min % 10 ? 'color1' : 'color2';

+            w = tl.px_per_min * 5;

             W('<td width="' + tl.px_per_min + '" height="' + tl.min5_h + '" class="' + c + '">');

                W('<img src="bilder/spacer.gif" width="' + w + '" height="1" border="0" /><br />');

             W('</td>');

@@ -283,14 +256,63 @@ function BuildTimeScale()
    W('</table>');

 }

 

-function BuildProgTable()

+function BuildSpacer(width)

 {

-   W('<table border="0" cellpadding="0" cellspacing="0" width="' + tl.table_w + '" class="prgname">');

-      for (var i = 0; i < channels.length; i++)

-      {

-         var c = "prgname " + (i % 2 ? "color1" : "color2");

-         BuildChannel(channels[i], c);

-      }

+   W('<table border="0" align="left" cellpadding="0" cellspacing="0" width="' + width + '" class="prgtable">');

+      W('<tr>');

+         W('<td width="1" class="color_spacer">');

+            W('<img src="bilder/spacer.gif" width="1" height="1" border="0"/><br />');

+            W('<nobr>');

+               W('<img src="bilder/spacer.gif" width="1" height="8" border="0"/>&nbsp;');

+            W('</nobr>');

+         W('</td>');

+      W('</tr>');

+   W('</table>');

+}

+

+function BuildNoEPG(event, width)

+{

+   W('<table border="0" align="left" cellpadding="0" cellspacing="0" width="' + width + '" class="prgtable">');

+      W('<tr>');

+         W('<td width="1" class="color_spacer">');

+            W('<img src="bilder/spacer.gif" width="1" height="1" border="0" /><br />');

+            W('<nobr>');

+              W(event.title);

+            W('</nobr>');

+         W('</td>');

+      W('</tr>');

+   W('</table>');

+}

+

+function BuildEvent(vdr_id, counter, event, td_class, px_w)

+{

+   var table_class = event.timer ? "timertable" : "prgtable";

+   W('<table border="0" align="left" cellpadding="0" cellspacing="0" width="' + px_w + '" class="' + table_class + '">');

+      W('<tr>');

+         W('<td width="1" class="' + td_class + '" ');

+         if (show_tooltips)

+         {

+            W('onMouseOver="tip(' + "'VDR-" + vdr_id + "-" + counter + "'); " + 'return true;" ');

+            W('onMouseOut="untip(); return true;" ');

+         }

+         W('>');

+            W('<img src="bilder/spacer.gif" width="1" height="1" border="0" /><br />');

+            W('<nobr>');

+               var anchor_start = "";

+               var anchor_end = "";

+               if (event.summary)

+               {

+                  anchor_start = '<a href="javascript:popup('

+                               + "'./vdradmin.pl?aktion=prog_detail&amp;epg_id="

+                               + event.epg_id + "&amp;vdr_id=" + vdr_id + "', " + popup_width + ", " + popup_height + ");" + '">';

+                  anchor_end = '</a>';

+               }

+               W(anchor_start);

+                  W(event.title);

+               W(anchor_end);

+            W('</nobr>');

+         W('</td>');

+      W('</tr>');

    W('</table>');

 }

 

@@ -306,22 +328,25 @@ function BuildChannel(channel, td_class)
             W('</a>');

          W('</nobr>');

       W('</td>');

-      

+

       /* Events */

       W('<td class="' + td_class + '">');

          W('<nobr>');

          var old_stop_min = 0;

        if (channel.events[0].start_sec > 0)

-       { 

+       {

          for (var i = 0; i < channel.events.length; i++)

          {

             var event = channel.events[i];

-            

+

             /* Calculate event start and stop time in minutes from table begin. */

             var start_min = Div(event.start_sec - tl.start_sec, 60);

             var stop_min = Div(event.stop_sec - tl.start_sec, 60);

-            if (start_min >= tl.end_min) break;

-   

+            if (start_min >= tl.end_min)

+            {

+               break;

+            }

+

             /* Adjust times to regard end of last event and end of table. */

             td_class = "";

             if (start_min < old_stop_min)

@@ -332,11 +357,17 @@ function BuildChannel(channel, td_class)
                  td_class = "color_spacer"; /* overlapped event */

                }

             }

-            if (stop_min > tl.end_min) stop_min = tl.end_min;

-   

+            if (stop_min > tl.end_min)

+            {

+               stop_min = tl.end_min;

+            }

+

             /* Ignore completely overlapped events. */

-            if (start_min >= stop_min) continue;

-   

+            if (start_min >= stop_min)

+            {

+               continue;

+            }

+

             if (!td_class)

             {

                if (event.timer)

@@ -356,12 +387,12 @@ function BuildChannel(channel, td_class)
                   td_class = "color_broadcast";

                }

             }

-            

+

             if (start_min  > old_stop_min + 1)

             {

                BuildSpacer((start_min - old_stop_min) * tl.px_per_min);

             }

-            

+

             var px_w = (stop_min - start_min) * tl.px_per_min;

             BuildEvent(channel.vdr_id, i, event, td_class, px_w);

             old_stop_min = stop_min;

@@ -374,93 +405,73 @@ function BuildChannel(channel, td_class)
        else

        {

          BuildNoEPG(channel.events[0], tl.end_min * tl.px_per_min);

-       } 

+       }

          W('</nobr>');

       W('</td>');

    W('</tr>');

 }

 

-function BuildSpacer(width)

+function BuildProgTable()

 {

-   W('<table border="0" align="left" cellpadding="0" cellspacing="0" width="' + width + '" class="prgtable">');

-      W('<tr>');

-         W('<td width="1" class="color_spacer">');

-            W('<img src="bilder/spacer.gif" width="1" height="1" border="0"/><br />');

-            W('<nobr>');

-               W('<img src="bilder/spacer.gif" width="1" height="8" border="0"/>&nbsp;');

-            W('</nobr>');

-         W('</td>');

-      W('</tr>');

+   W('<table border="0" cellpadding="0" cellspacing="0" width="' + tl.table_w + '" class="prgname">');

+      for (var i = 0; i < channels.length; i++)

+      {

+         var c = "prgname " + (i % 2 ? "color1" : "color2");

+         BuildChannel(channels[i], c);

+      }

    W('</table>');

 }

 

-function BuildEvent(vdr_id, counter, event, td_class, px_w)

+function BuildTable()

 {

-   var table_class = event.timer ? "timertable" : "prgtable";

-   W('<table border="0" align="left" cellpadding="0" cellspacing="0" width="' + px_w + '" class="' + table_class + '">');

-      W('<tr>');

-         W('<td width="1" class="' + td_class + '" ');

-         if (show_tooltips)

-         {

-            W('onMouseOver="tip(' + "'VDR-" + vdr_id + "-" + counter + "'); " + 'return true;" ');

-            W('onMouseOut="untip(); return true;" ');

-         }

-         W('>');

-            W('<img src="bilder/spacer.gif" width="1" height="1" border="0" /><br />');

-            W('<nobr>');

-               var anchor_start = "";

-               var anchor_end = "";

-               if (event.summary)

-               {

-                  anchor_start = '<a href="javascript:popup(' 

-                               + "'./vdradmin.pl?aktion=prog_detail&amp;epg_id=" 

-                               + event.epg_id + "&amp;vdr_id=" + vdr_id + "', " + popup_width + ", " + popup_height + ");" + '">';

-                  anchor_end = '</a>';

-               }

-               W(anchor_start);

-                  W(event.title);

-               W(anchor_end);

-            W('</nobr>');

-         W('</td>');

-      W('</tr>');

-   W('</table>');

+   W('<tr id="row_timeline" class="row_even">');

+      W('<td colspan="4">');

+         BuildTimeScale();

+         BuildProgTable();

+      W('</td>');

+   W('</tr>');

 }

 

-function BuildNoEPG(event, width)

+function BuildContentDiv()

 {

-   W('<table border="0" align="left" cellpadding="0" cellspacing="0" width="' + width + '" class="prgtable">');

-      W('<tr>');

-         W('<td width="1" class="color_spacer">');

-            W('<img src="bilder/spacer.gif" width="1" height="1" border="0" /><br />');

-            W('<nobr>');

-              W(event.title);

-            W('</nobr>');

-         W('</td>');

-      W('</tr>');

-   W('</table>');

+   W('<div id="content">');

+

+      W('<table width="' + tl.table_w + '" border="0" cellspacing="0" cellpadding="0" class="bigtable list">');

+         BuildHeader();

+         BuildTable();

+      W('</table>');

+

+      DrawTimeLine();

+   W('</div>');

 }

 

-function DrawTimeLine()

+function BuildContent()

 {

-   var tab = document.getElementById("row_timeline");

-   if (tab && (tl.start_sec <= tl.now_sec) && (tl.now_sec < tl.end_sec))

+   /* Write content div */

+   BuildContentDiv();

+

+   /* Check if the width has changed due to vertical scrollbar */

+   var tab = document.getElementById("heading");

+   var table_w;

+   if (tab)

    {

-      var x = tl.name_w + tl.px_per_min * Div(tl.now_sec - tl.start_sec, 60) + 1;

-      var y = tab.offsetTop;

-      var h = tab.offsetHeight;

-      var style = "position:absolute; "

-                + "top:" + y + "px; "

-                + "left:" + x + "px; "

-                + "width:1px; "

-                + "height:" + h + "px; "

-                + "z-index:2; ";

-      if (document.all)

-      {

-         style = style + "filter:Alpha(opacity=50); ";

-      }

+      table_w = tab.clientWidth;

+   }

+   else

+   {

+      table_w = this.innerWidth;

+   }

 

-      W('<span id="timeline" style="' + style + '">');

-      W('   <img src="bilder/spacer.gif" width="1" height="1" border="0" />');

-      W('</span>');

+   if (tl.table_w > table_w)

+   {

+      /* Recalculate all data for new table width */

+      SetTimeLine(tl, table_w, tl.org_px_per_min, tl.org_end_min);

+

+      /* Delete first content div */

+      tab = document.getElementById("content");

+      tab.innerHTML = null;

+

+      /* Write second content div */

+      BuildContentDiv();

    }

 }