diff options
| author | Andreas Mair <amair.sob@googlemail.com> | 2006-05-11 16:00:36 +0200 |
|---|---|---|
| committer | Andreas Mair <amair.sob@googlemail.com> | 2006-05-11 16:00:36 +0200 |
| commit | 5c4f0e4fde2cd82a85b766dd2e92a1c7c4be133f (patch) | |
| tree | 19811e28e2faf86d9401c87d7a118d79b59786f8 | |
| parent | 74606cfffbf79083902d79a330c00d46c12482e6 (diff) | |
| download | vdradmin-am-3.4.5.tar.gz vdradmin-am-3.4.5.tar.bz2 | |
2006-05-12: 3.4.5v3.4.5
- Fixed: crash if /usr/bin/locale is a directory (Reported by pmeyer).
- Changed: reformated vdradmind.pl using perltidy.
- Fixed: Only sort by start time in prog_summary if it's a search result (Reported by Toxic-Tonic).
- Fixed: install russian catalog (Reported by free-x).
- Added: credits for russian translation to about menu.
| -rw-r--r-- | HISTORY | 7 | ||||
| -rwxr-xr-x | install.sh | 2 | ||||
| -rw-r--r-- | locale/de/LC_MESSAGES/vdradmin.mo | bin | 61338 -> 61373 bytes | |||
| -rw-r--r-- | locale/es/LC_MESSAGES/vdradmin.mo | bin | 59117 -> 59568 bytes | |||
| -rw-r--r-- | locale/fi/LC_MESSAGES/vdradmin.mo | bin | 16826 -> 16826 bytes | |||
| -rw-r--r-- | locale/fr/LC_MESSAGES/vdradmin.mo | bin | 62134 -> 62491 bytes | |||
| -rw-r--r-- | locale/nl/LC_MESSAGES/vdradmin.mo | bin | 58772 -> 59200 bytes | |||
| -rw-r--r-- | locale/ru/LC_MESSAGES/vdradmin.mo | bin | 57183 -> 57183 bytes | |||
| -rw-r--r-- | po/de.po | 84 | ||||
| -rw-r--r-- | po/es.po | 111 | ||||
| -rw-r--r-- | po/fi.po | 84 | ||||
| -rw-r--r-- | po/fr.po | 213 | ||||
| -rw-r--r-- | po/fr.po.orig | 2181 | ||||
| -rw-r--r-- | po/nl.po | 94 | ||||
| -rw-r--r-- | po/ru.po | 84 | ||||
| -rw-r--r-- | po/vdradmin.pot | 84 | ||||
| -rw-r--r-- | template/default/about.html | 8 | ||||
| -rwxr-xr-x | vdradmind.pl | 8682 |
18 files changed, 4754 insertions, 6880 deletions
@@ -4,6 +4,13 @@ E-Mail: mail AT andreas DOT vdr-developer DOT org VDR-Portal: amair ----------------------------------------------------------- +2006-05-12: 3.4.5 +- Fixed: crash if /usr/bin/locale is a directory (Reported by pmeyer). +- Changed: reformated vdradmind.pl using perltidy. +- Fixed: Only sort by start time in prog_summary if it's a search result (Reported by Toxic-Tonic). +- Fixed: install russian catalog (Reported by free-x). +- Added: credits for russian translation to about menu. + 2006-04-28: 3.4.5rc - Changed: request full "from" email address for sending emails instead of domain only (Requested by siryoda). - Changed: no red background for inactive timers in prog_timeline (Requested by Zimbo). @@ -20,7 +20,7 @@ EPGIMAGES=${EPGIMAGES:-$VIDEODIR/epgimages} VDRCONF=${VDRCONF:-$VIDEODIR} EPGDATA=${EPGDATA:-$VIDEODIR/epg.data} -LANGS="de es fr fi nl" +LANGS="de es fi fr nl ru" function usage() { diff --git a/locale/de/LC_MESSAGES/vdradmin.mo b/locale/de/LC_MESSAGES/vdradmin.mo Binary files differindex 50c42dd..a77d286 100644 --- a/locale/de/LC_MESSAGES/vdradmin.mo +++ b/locale/de/LC_MESSAGES/vdradmin.mo diff --git a/locale/es/LC_MESSAGES/vdradmin.mo b/locale/es/LC_MESSAGES/vdradmin.mo Binary files differindex 7d2bedf..e6bb559 100644 --- a/locale/es/LC_MESSAGES/vdradmin.mo +++ b/locale/es/LC_MESSAGES/vdradmin.mo diff --git a/locale/fi/LC_MESSAGES/vdradmin.mo b/locale/fi/LC_MESSAGES/vdradmin.mo Binary files differindex f84f338..89a97ea 100644 --- a/locale/fi/LC_MESSAGES/vdradmin.mo +++ b/locale/fi/LC_MESSAGES/vdradmin.mo diff --git a/locale/fr/LC_MESSAGES/vdradmin.mo b/locale/fr/LC_MESSAGES/vdradmin.mo Binary files differindex ac32754..0fce2e3 100644 --- a/locale/fr/LC_MESSAGES/vdradmin.mo +++ b/locale/fr/LC_MESSAGES/vdradmin.mo diff --git a/locale/nl/LC_MESSAGES/vdradmin.mo b/locale/nl/LC_MESSAGES/vdradmin.mo Binary files differindex 4f73e00..e59a2a7 100644 --- a/locale/nl/LC_MESSAGES/vdradmin.mo +++ b/locale/nl/LC_MESSAGES/vdradmin.mo diff --git a/locale/ru/LC_MESSAGES/vdradmin.mo b/locale/ru/LC_MESSAGES/vdradmin.mo Binary files differindex 8399796..d1a7470 100644 --- a/locale/ru/LC_MESSAGES/vdradmin.mo +++ b/locale/ru/LC_MESSAGES/vdradmin.mo @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: VDRAdmin-AM-3.4.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-04-28 12:15+0200\n" +"POT-Creation-Date: 2006-05-11 16:09+0200\n" "PO-Revision-Date: 2006-03-30 14:49+0100\n" "Last-Translator: Andreas Mair <mail@andreas.vdr-developer.org>\n" "Language-Team: <LL.org>\n" @@ -188,7 +188,7 @@ msgstr "Startzeit:" #: ../template/default/prog_timeline.html:108 #: ../template/default/prog_timeline.html:123 #: ../template/default/at_timer_new.html:111 -#: ../template/default/at_timer_new.html:122 ../vdradmind.pl:3981 +#: ../template/default/at_timer_new.html:122 ../vdradmind.pl:3977 msgid "o'clock" msgstr "Uhr" @@ -374,7 +374,7 @@ msgstr "Ausgewählte Timer wirklich löschen?" #: ../template/default/prog_summary.html:7 #: ../template/default/prog_timeline.html:7 -#: ../template/default/navigation.html:30 ../vdradmind.pl:4558 +#: ../template/default/navigation.html:30 ../vdradmind.pl:4573 msgid "What's On Now?" msgstr "Was läuft jetzt?" @@ -499,7 +499,7 @@ msgstr "Gast Passwort:" #: ../template/default/config.html:213 ../template/default/help_config.html:38 #: ../template/default/help_config.html:86 -#: ../template/default/navigation.html:38 ../vdradmind.pl:4560 +#: ../template/default/navigation.html:38 ../vdradmind.pl:4573 msgid "Timeline" msgstr "Zeitleiste" @@ -768,7 +768,7 @@ msgid "Delete Selected Timers" msgstr "Ausgewählte Timer löschen" #: ../template/default/prog_list.html:6 ../template/default/navigation.html:42 -#: ../vdradmind.pl:4561 +#: ../vdradmind.pl:4573 msgid "Channels" msgstr "Programmübersicht" @@ -834,7 +834,7 @@ msgstr "Film in der Internet-Movie-Database (IMDb) suchen" #: ../template/default/rec_list.html:6 ../template/default/rec_list.html:18 #: ../template/default/help_rec_list.html:6 #: ../template/default/help_rec_list.html:18 -#: ../template/default/navigation.html:54 ../vdradmind.pl:4563 +#: ../template/default/navigation.html:54 ../vdradmind.pl:4573 msgid "Recordings" msgstr "Aufnahmen" @@ -1326,7 +1326,7 @@ msgid "to" msgstr "bis" #: ../template/default/prog_list2.html:6 -#: ../template/default/navigation.html:34 ../vdradmind.pl:2637 +#: ../template/default/navigation.html:34 ../vdradmind.pl:2676 msgid "Playing Today" msgstr "Was läuft heute?" @@ -2001,23 +2001,27 @@ msgstr "Deutsch:" msgid "Spanish:" msgstr "Spanisch:" -#: ../template/default/about.html:102 +#: ../template/default/about.html:94 +msgid "Russian:" +msgstr "Russisch:" + +#: ../template/default/about.html:108 msgid "Informations" msgstr "Informationen" -#: ../template/default/about.html:112 +#: ../template/default/about.html:118 msgid "VDRAdmin-AM version:" msgstr "VDRAdmin-AM Version:" -#: ../template/default/about.html:118 +#: ../template/default/about.html:124 msgid "VDR version:" msgstr "VDR Version:" -#: ../template/default/about.html:132 +#: ../template/default/about.html:138 msgid "Getting Help and Reporting Bugs" msgstr "Hilfe bekommen und Fehler melden" -#: ../template/default/about.html:144 +#: ../template/default/about.html:150 msgid "" "If you need help please first try to use the online help you'll find on some " "pages. You can access it by clicking <img src=\"bilder/help.gif\"/>." @@ -2026,7 +2030,7 @@ msgstr "" "Online-Hilfe, die für einige Seiten verfügbar ist. Sie können Sie aufrufen " "indem Sie <img src=\"bilder/help.gif\"/> anklicken." -#: ../template/default/about.html:145 +#: ../template/default/about.html:151 msgid "" "If this doesn't provide the information you need you can try to get help at " "<a href=\"http://www.vdrportal.de\" target=\"_blank\">VDR-Portal</a> if you " @@ -2038,7 +2042,7 @@ msgstr "" "a> zu bekommen. Bitte verwenden Sie hierfür wenn möglich den " "Ankündigungsthread, suchen Sie dafür nach:" -#: ../template/default/about.html:146 +#: ../template/default/about.html:152 msgid "" "If you think you have found a bug please check that it's a new one and " "report it in the <a href=\"http://www.vdr-developer.org/mantisbt/main_page." @@ -2069,81 +2073,81 @@ msgstr "In commands.conf definierte Befehle:" msgid "Output" msgstr "Ausgabe" -#: ../vdradmind.pl:296 +#: ../vdradmind.pl:312 msgid "What's your VDR hostname (e.g video.intra.net)?" msgstr "Wie lautet der Hostname des VDR (z.B. video.intra.net)?" -#: ../vdradmind.pl:297 +#: ../vdradmind.pl:313 msgid "On which port does VDR listen to SVDRP queries?" msgstr "Auf welchem Port hört der VDR auf SVDRP-Anfragen?" -#: ../vdradmind.pl:298 +#: ../vdradmind.pl:314 msgid "On which address should VDRAdmin-AM listen (0.0.0.0 for any)?" msgstr "" "An welcher Adresse soll VDRAdmin-AM auf Verbindungen warten (0.0.0.0 für " "alle)?" -#: ../vdradmind.pl:299 +#: ../vdradmind.pl:315 msgid "On which port should VDRAdmin-AM listen?" msgstr "Auf welchem Port soll VDRAdmin-AM hören?" -#: ../vdradmind.pl:300 +#: ../vdradmind.pl:316 msgid "Username?" msgstr "Benutzername?" -#: ../vdradmind.pl:301 +#: ../vdradmind.pl:317 msgid "Password?" msgstr "Passwort?" -#: ../vdradmind.pl:302 +#: ../vdradmind.pl:318 msgid "Where are your recordings stored?" msgstr "Wo befinden sich die Aufnahmen?" -#: ../vdradmind.pl:303 +#: ../vdradmind.pl:319 msgid "Where are your VDR's configuration files located?" msgstr "Wo befinden sich die Konfigurationsdateien des VDR?" -#: ../vdradmind.pl:309 +#: ../vdradmind.pl:326 msgid "Config file written successfully." msgstr "Konfigurationsdatei wurde erfolgreich geschrieben." -#: ../vdradmind.pl:362 +#: ../vdradmind.pl:381 #, perl-format msgid "vdradmind.pl %s started with pid %d." msgstr "vdradmind.pl %s wurde mit der Prozeß-ID %d gestartet." -#: ../vdradmind.pl:418 ../vdradmind.pl:1015 ../vdradmind.pl:1947 +#: ../vdradmind.pl:440 ../vdradmind.pl:1038 ../vdradmind.pl:1998 msgid "Not found" msgstr "Nicht gefunden" -#: ../vdradmind.pl:418 ../vdradmind.pl:1948 +#: ../vdradmind.pl:440 ../vdradmind.pl:1999 msgid "The requested URL was not found on this server!" msgstr "Die angeforderte URL konnte auf dem Server nicht gefunden werden!" -#: ../vdradmind.pl:487 ../vdradmind.pl:1011 ../vdradmind.pl:1950 +#: ../vdradmind.pl:510 ../vdradmind.pl:1034 ../vdradmind.pl:2001 msgid "Forbidden" msgstr "Verboten" -#: ../vdradmind.pl:487 ../vdradmind.pl:1951 +#: ../vdradmind.pl:510 ../vdradmind.pl:2002 msgid "You don't have permission to access this function!" msgstr "Sie haben nicht die Erlaubnis diese Funktion aufzurufen!" -#: ../vdradmind.pl:1011 ../vdradmind.pl:1952 +#: ../vdradmind.pl:1034 ../vdradmind.pl:2003 #, perl-format msgid "Access to file \"%s\" denied!" msgstr "Zugriff auf Datei \"%s\" verweigert!" -#: ../vdradmind.pl:1015 ../vdradmind.pl:1949 +#: ../vdradmind.pl:1038 ../vdradmind.pl:2000 #, perl-format msgid "The URL \"%s\" was not found on this server!" msgstr "Die URL \"%s\" wurde auf dem Server nicht gefunden!" -#: ../vdradmind.pl:1953 +#: ../vdradmind.pl:2004 #, perl-format msgid "Can't open file \"%s\"!" msgstr "Kann Datei \"%s\" nicht öffnen!" -#: ../vdradmind.pl:1954 +#: ../vdradmind.pl:2005 #, perl-format msgid "" "Can't connect to VDR at %s:%s<br /><br />Please check if VDR is running and " @@ -2152,37 +2156,37 @@ msgstr "" "Konnte Verbindung zu %s:%s nicht aufbauen!<br /><br />Bitte überprüfen Sie, " "dass VDR läuft und dass seine svdrphosts.conf richtig konfiguriert ist." -#: ../vdradmind.pl:1955 +#: ../vdradmind.pl:2006 #, perl-format msgid "Error while sending command to VDR at %s" msgstr "Fehler beim Senden eines Kommandos zu %s" -#: ../vdradmind.pl:2637 +#: ../vdradmind.pl:2676 msgid "Playing Tomorrow" msgstr "Was läuft morgen" -#: ../vdradmind.pl:2637 +#: ../vdradmind.pl:2676 #, perl-format msgid "Playing on the %d." msgstr "Was läuft am %d." -#: ../vdradmind.pl:3981 +#: ../vdradmind.pl:3977 msgid "Suitable matches for:" msgstr "Suchergebnis für" -#: ../vdradmind.pl:4036 +#: ../vdradmind.pl:4034 msgid "Schedule" msgstr "Übersicht" -#: ../vdradmind.pl:4559 +#: ../vdradmind.pl:4573 msgid "Playing Today?" msgstr "Was läuft heute?" -#: ../vdradmind.pl:4562 +#: ../vdradmind.pl:4573 msgid "Timers" msgstr "Timer" -#: ../vdradmind.pl:4625 +#: ../vdradmind.pl:4641 msgid "System default" msgstr "Systemstandard" @@ -1,3 +1,4 @@ +# translation of es.po to # # Translators, if you are not familiar with the PO format, gettext # documentation is worth reading, especially sections dedicated to @@ -10,22 +11,24 @@ # or http://www.debian.org/intl/l10n/po-debconf/README-trans # # Developers do not need to manually edit POT or PO files. +# User de Solid PC, 2006. # msgid "" msgstr "" -"Project-Id-Version: VDRAdmin-AM-3.2\n" +"Project-Id-Version: es\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-04-28 12:15+0200\n" -"PO-Revision-Date: 2006-03-29 13:22+0100\n" -"Last-Translator: rudibert <jung.ruediger@gmail.com>\n" -"Language-Team: Rudi <LL.org>\n" +"POT-Creation-Date: 2006-05-11 16:09+0200\n" +"PO-Revision-Date: 2006-05-10 20:24+0100\n" +"Last-Translator: rudy <r_jung@web.de>\n" +"Language-Team: <es@li.org>\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=iso-8859-1\n" +"Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: Spanish\n" "X-Poedit-Country: SPAIN\n" "X-Poedit-SourceCharset: iso-8859-1\n" "X-Poedit-Bookmarks: 210,-1,86,-1,-1,-1,-1,-1,-1,-1\n" +"X-Generator: KBabel 1.10.2\n" #: ../template/default/noperm.html:4 ../template/default/index.html:5 #: ../template/default/timer_new.html:5 ../template/default/help_no.html:5 @@ -192,7 +195,7 @@ msgstr "Comienzo:" #: ../template/default/prog_timeline.html:108 #: ../template/default/prog_timeline.html:123 #: ../template/default/at_timer_new.html:111 -#: ../template/default/at_timer_new.html:122 ../vdradmind.pl:3981 +#: ../template/default/at_timer_new.html:122 ../vdradmind.pl:3977 msgid "o'clock" msgstr "h." @@ -300,7 +303,7 @@ msgstr "" "Este servidor no pudo verificar, tú permiso de acceso al documento requerido." "<br>\n" "Posiblemente por entregar datos incorrectos (nombre del usuario o contraseña " -"p.e.) o por que tú navegador no soporta la forma de acceso." +"p.e.) o por que tú navegador no soporta el modo de acceso." #: ../template/default/at_timer_list.html:6 #: ../template/default/at_timer_list.html:36 @@ -379,7 +382,7 @@ msgstr "¿Estas seguro de que deseas borrar las programaciones elegidas?" #: ../template/default/prog_summary.html:7 #: ../template/default/prog_timeline.html:7 -#: ../template/default/navigation.html:30 ../vdradmind.pl:4558 +#: ../template/default/navigation.html:30 ../vdradmind.pl:4573 msgid "What's On Now?" msgstr "Estrenos ahora" @@ -504,7 +507,7 @@ msgstr "Contraseña como invitado:" #: ../template/default/config.html:213 ../template/default/help_config.html:38 #: ../template/default/help_config.html:86 -#: ../template/default/navigation.html:38 ../vdradmind.pl:4560 +#: ../template/default/navigation.html:38 ../vdradmind.pl:4573 msgid "Timeline" msgstr "Tabla de tiempo" @@ -595,7 +598,7 @@ msgstr "Extremidades de herramienta en la lista:" #: ../template/default/config.html:413 #: ../template/default/help_config.html:140 msgid "Add summary to new timers:" -msgstr "A" +msgstr "Añadir resumen a programaciones creadas:" #: ../template/default/config.html:431 ../template/default/help_config.html:38 #: ../template/default/help_config.html:146 @@ -774,7 +777,7 @@ msgid "Delete Selected Timers" msgstr "Borrar programaciones elegidas" #: ../template/default/prog_list.html:6 ../template/default/navigation.html:42 -#: ../vdradmind.pl:4561 +#: ../vdradmind.pl:4573 msgid "Channels" msgstr "EPG por emisoras" @@ -840,7 +843,7 @@ msgstr "Buscar la película en la base de datos de películas en Internet (IMDb)" #: ../template/default/rec_list.html:6 ../template/default/rec_list.html:18 #: ../template/default/help_rec_list.html:6 #: ../template/default/help_rec_list.html:18 -#: ../template/default/navigation.html:54 ../vdradmind.pl:4563 +#: ../template/default/navigation.html:54 ../vdradmind.pl:4573 msgid "Recordings" msgstr "Grabaciones" @@ -1119,9 +1122,8 @@ msgstr "" "esta posibilidad." #: ../template/default/help_config.html:111 -#, fuzzy msgid "Here you set the sending email address of the generated email." -msgstr "Aquí se ajusta el dominio del mensaje generado." +msgstr "Aquí se ajusta la dirección remitente del mensaje generado." #: ../template/default/help_config.html:113 msgid "The email address the email is sent to." @@ -1327,7 +1329,7 @@ msgid "to" msgstr "hasta" #: ../template/default/prog_list2.html:6 -#: ../template/default/navigation.html:34 ../vdradmind.pl:2637 +#: ../template/default/navigation.html:34 ../vdradmind.pl:2676 msgid "Playing Today" msgstr "Estrenos hoy" @@ -2031,23 +2033,27 @@ msgstr "Alemán:" msgid "Spanish:" msgstr "Español:" -#: ../template/default/about.html:102 +#: ../template/default/about.html:94 +msgid "Russian:" +msgstr "" + +#: ../template/default/about.html:108 msgid "Informations" msgstr "Informaciones" -#: ../template/default/about.html:112 +#: ../template/default/about.html:118 msgid "VDRAdmin-AM version:" msgstr "Versión del VDRAdmin-AM:" -#: ../template/default/about.html:118 +#: ../template/default/about.html:124 msgid "VDR version:" msgstr "Versión del VDR:" -#: ../template/default/about.html:132 +#: ../template/default/about.html:138 msgid "Getting Help and Reporting Bugs" msgstr "Recibir ayuda y comentar \"Bugs\" (fallos)" -#: ../template/default/about.html:144 +#: ../template/default/about.html:150 msgid "" "If you need help please first try to use the online help you'll find on some " "pages. You can access it by clicking <img src=\"bilder/help.gif\"/>." @@ -2056,7 +2062,7 @@ msgstr "" "encontraras en algunas páginas. Tienes acceso haciendo clic encima de <img " "src=\"bilder/help.gif\"/>." -#: ../template/default/about.html:145 +#: ../template/default/about.html:151 msgid "" "If this doesn't provide the information you need you can try to get help at " "<a href=\"http://www.vdrportal.de\" target=\"_blank\">VDR-Portal</a> if you " @@ -2068,7 +2074,7 @@ msgstr "" "entiendes alemán (lo siento...). Para empezar alli aprovecha la funcción " "\"suchen\" por:" -#: ../template/default/about.html:146 +#: ../template/default/about.html:152 msgid "" "If you think you have found a bug please check that it's a new one and " "report it in the <a href=\"http://www.vdr-developer.org/mantisbt/main_page." @@ -2099,118 +2105,117 @@ msgstr "Órdenes definido en commands.conf:" msgid "Output" msgstr "Salida" -#: ../vdradmind.pl:296 +#: ../vdradmind.pl:312 msgid "What's your VDR hostname (e.g video.intra.net)?" msgstr "¿Cuál es el nombre del sitio del VDR (p.e. video.intra.net)?" -#: ../vdradmind.pl:297 +#: ../vdradmind.pl:313 msgid "On which port does VDR listen to SVDRP queries?" msgstr "¿Cuál puerto esta vigilando VDR para requeridas de SVDRP?" -#: ../vdradmind.pl:298 +#: ../vdradmind.pl:314 msgid "On which address should VDRAdmin-AM listen (0.0.0.0 for any)?" msgstr "¿En qué dirección debe VDRAdmin-AM escuchar (0.0.0.0 para todas)?" -#: ../vdradmind.pl:299 +#: ../vdradmind.pl:315 msgid "On which port should VDRAdmin-AM listen?" msgstr "¿Qué puerto debe VDRAdmin-AM esperar órdenes?" -#: ../vdradmind.pl:300 +#: ../vdradmind.pl:316 msgid "Username?" msgstr "¿Nombre del usuario?" -#: ../vdradmind.pl:301 +#: ../vdradmind.pl:317 msgid "Password?" msgstr "¿Contraseña?" -#: ../vdradmind.pl:302 +#: ../vdradmind.pl:318 msgid "Where are your recordings stored?" msgstr "Introduce la ruta de las grabaciones:" -#: ../vdradmind.pl:303 +#: ../vdradmind.pl:319 msgid "Where are your VDR's configuration files located?" msgstr "Introduce la ruta de los archivos de configuración:" -#: ../vdradmind.pl:309 +#: ../vdradmind.pl:326 msgid "Config file written successfully." msgstr "¡Los archivos de configuración han creado!" -#: ../vdradmind.pl:362 +#: ../vdradmind.pl:381 #, perl-format msgid "vdradmind.pl %s started with pid %d." msgstr "vdradmind.pl %s se ha iniciado con pid %d." -#: ../vdradmind.pl:418 ../vdradmind.pl:1015 ../vdradmind.pl:1947 +#: ../vdradmind.pl:440 ../vdradmind.pl:1038 ../vdradmind.pl:1998 msgid "Not found" msgstr "No encontrado" -#: ../vdradmind.pl:418 ../vdradmind.pl:1948 +#: ../vdradmind.pl:440 ../vdradmind.pl:1999 msgid "The requested URL was not found on this server!" msgstr "¡No encontrado la URL requerida, en el servidor!" -#: ../vdradmind.pl:487 ../vdradmind.pl:1011 ../vdradmind.pl:1950 +#: ../vdradmind.pl:510 ../vdradmind.pl:1034 ../vdradmind.pl:2001 msgid "Forbidden" msgstr "Prohibido" -#: ../vdradmind.pl:487 ../vdradmind.pl:1951 +#: ../vdradmind.pl:510 ../vdradmind.pl:2002 msgid "You don't have permission to access this function!" msgstr "¡No tienes permiso para ésta funcción!" -#: ../vdradmind.pl:1011 ../vdradmind.pl:1952 +#: ../vdradmind.pl:1034 ../vdradmind.pl:2003 #, perl-format msgid "Access to file \"%s\" denied!" msgstr "¡Acceso al archivo \"%s\" negado!" -#: ../vdradmind.pl:1015 ../vdradmind.pl:1949 +#: ../vdradmind.pl:1038 ../vdradmind.pl:2000 #, perl-format msgid "The URL \"%s\" was not found on this server!" msgstr "¡No encontrado la URL %s en el servidor!" -#: ../vdradmind.pl:1953 +#: ../vdradmind.pl:2004 #, perl-format msgid "Can't open file \"%s\"!" msgstr "¡No se pudo abrir el archivo \"%s\" !" -#: ../vdradmind.pl:1954 +#: ../vdradmind.pl:2005 #, perl-format msgid "" "Can't connect to VDR at %s:%s<br /><br />Please check if VDR is running and " "if VDR's svdrphosts.conf is configured correctly." msgstr "" +"No se puede conectar a VDR en %s:%s<br /><br />Comprueba si VDR está " +"activado y su svdrphosts.conf correctamente configurado." -#: ../vdradmind.pl:1955 +#: ../vdradmind.pl:2006 #, perl-format msgid "Error while sending command to VDR at %s" -msgstr "Error mientras mandó el orden a %s " +msgstr "Error mientras mandó el orden a VDR en %s " -#: ../vdradmind.pl:2637 +#: ../vdradmind.pl:2676 msgid "Playing Tomorrow" msgstr "Estrenos mañana" -#: ../vdradmind.pl:2637 +#: ../vdradmind.pl:2676 #, perl-format msgid "Playing on the %d." msgstr "Estrenos en %d" -#: ../vdradmind.pl:3981 +#: ../vdradmind.pl:3977 msgid "Suitable matches for:" msgstr "Emparejamientos convenientes para:" -#: ../vdradmind.pl:4036 +#: ../vdradmind.pl:4034 msgid "Schedule" msgstr "Vista general" -#: ../vdradmind.pl:4559 +#: ../vdradmind.pl:4573 msgid "Playing Today?" msgstr "¿Estrenos hoy?" -#: ../vdradmind.pl:4562 +#: ../vdradmind.pl:4573 msgid "Timers" msgstr "Programaciones" -#: ../vdradmind.pl:4625 +#: ../vdradmind.pl:4641 msgid "System default" msgstr "Defecto del sistema" - -#~ msgid "Can't connect to VDR at %s!" -#~ msgstr "¡No se pudo estabilizar la conexión a %s!" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDRAdmin-AM-3.4.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-04-28 12:15+0200\n" +"POT-Creation-Date: 2006-05-11 16:09+0200\n" "PO-Revision-Date: 2006-01-18 12:36+0200\n" "Last-Translator: Rofa\n" "Language-Team: Suomi\n" @@ -180,7 +180,7 @@ msgstr "Aloitusaika:" #: ../template/default/prog_timeline.html:108 #: ../template/default/prog_timeline.html:123 #: ../template/default/at_timer_new.html:111 -#: ../template/default/at_timer_new.html:122 ../vdradmind.pl:3981 +#: ../template/default/at_timer_new.html:122 ../vdradmind.pl:3977 msgid "o'clock" msgstr " " @@ -363,7 +363,7 @@ msgstr "Poistetaanko valitut ajastimet?" #: ../template/default/prog_summary.html:7 #: ../template/default/prog_timeline.html:7 -#: ../template/default/navigation.html:30 ../vdradmind.pl:4558 +#: ../template/default/navigation.html:30 ../vdradmind.pl:4573 msgid "What's On Now?" msgstr "Menossa nyt" @@ -488,7 +488,7 @@ msgstr "Vierailijan salasana:" #: ../template/default/config.html:213 ../template/default/help_config.html:38 #: ../template/default/help_config.html:86 -#: ../template/default/navigation.html:38 ../vdradmind.pl:4560 +#: ../template/default/navigation.html:38 ../vdradmind.pl:4573 msgid "Timeline" msgstr "Aikajana" @@ -757,7 +757,7 @@ msgid "Delete Selected Timers" msgstr "Poista valitut ajastimet" #: ../template/default/prog_list.html:6 ../template/default/navigation.html:42 -#: ../vdradmind.pl:4561 +#: ../vdradmind.pl:4573 msgid "Channels" msgstr "Kanavat" @@ -823,7 +823,7 @@ msgstr "etsi IMDB:stä" #: ../template/default/rec_list.html:6 ../template/default/rec_list.html:18 #: ../template/default/help_rec_list.html:6 #: ../template/default/help_rec_list.html:18 -#: ../template/default/navigation.html:54 ../vdradmind.pl:4563 +#: ../template/default/navigation.html:54 ../vdradmind.pl:4573 msgid "Recordings" msgstr "Tallenteet" @@ -1199,7 +1199,7 @@ msgid "to" msgstr "-" #: ../template/default/prog_list2.html:6 -#: ../template/default/navigation.html:34 ../vdradmind.pl:2637 +#: ../template/default/navigation.html:34 ../vdradmind.pl:2676 msgid "Playing Today" msgstr "Ohjelmisto tänään" @@ -1666,30 +1666,34 @@ msgstr "Saksa:" msgid "Spanish:" msgstr "Espanja:" -#: ../template/default/about.html:102 +#: ../template/default/about.html:94 +msgid "Russian:" +msgstr "" + +#: ../template/default/about.html:108 msgid "Informations" msgstr "Lisätietoja" -#: ../template/default/about.html:112 +#: ../template/default/about.html:118 msgid "VDRAdmin-AM version:" msgstr "VDRAdmin-AM:n versio:" -#: ../template/default/about.html:118 +#: ../template/default/about.html:124 msgid "VDR version:" msgstr "VDR:n versio:" -#: ../template/default/about.html:132 +#: ../template/default/about.html:138 msgid "Getting Help and Reporting Bugs" msgstr "Avunsaanti ja virheiden raportointi" -#: ../template/default/about.html:144 +#: ../template/default/about.html:150 msgid "" "If you need help please first try to use the online help you'll find on some " "pages. You can access it by clicking <img src=\"bilder/help.gif\"/>." msgstr "" "Saat opasteen näytille painamalla <img src=\"bilder/help.gif\"/> -kuvaketta." -#: ../template/default/about.html:145 +#: ../template/default/about.html:151 msgid "" "If this doesn't provide the information you need you can try to get help at " "<a href=\"http://www.vdrportal.de\" target=\"_blank\">VDR-Portal</a> if you " @@ -1700,7 +1704,7 @@ msgstr "" "vdrportal.de\" target=\"_blank\">VDR-Portal</a> -foorumilta, missä " "ensisijaisesti kannattaa selata VDRAdminin julkistussäie läpi: " -#: ../template/default/about.html:146 +#: ../template/default/about.html:152 msgid "" "If you think you have found a bug please check that it's a new one and " "report it in the <a href=\"http://www.vdr-developer.org/mantisbt/main_page." @@ -1730,79 +1734,79 @@ msgstr "Määritellyt komennot (commands.conf):" msgid "Output" msgstr "Vaste" -#: ../vdradmind.pl:296 +#: ../vdradmind.pl:312 msgid "What's your VDR hostname (e.g video.intra.net)?" msgstr "Anna VDR-koneesi nimi (esim. video.intra.net):" -#: ../vdradmind.pl:297 +#: ../vdradmind.pl:313 msgid "On which port does VDR listen to SVDRP queries?" msgstr "Anna VDR-koneesi käyttämä SVDRP-portti:" -#: ../vdradmind.pl:298 +#: ../vdradmind.pl:314 msgid "On which address should VDRAdmin-AM listen (0.0.0.0 for any)?" msgstr "Anna VDRAdmin-AM käyttämä osoiteavaruus (0.0.0.0 ei rajoituksia):" -#: ../vdradmind.pl:299 +#: ../vdradmind.pl:315 msgid "On which port should VDRAdmin-AM listen?" msgstr "Anna VDRAdmin-AM käyttämä portti:" -#: ../vdradmind.pl:300 +#: ../vdradmind.pl:316 msgid "Username?" msgstr "Anna käyttäjätunnus VDRAdmin-AM varten:" -#: ../vdradmind.pl:301 +#: ../vdradmind.pl:317 msgid "Password?" msgstr "Anna salasana VDRAdmin-AM varten:" -#: ../vdradmind.pl:302 +#: ../vdradmind.pl:318 msgid "Where are your recordings stored?" msgstr "Anna VDR-koneesi tallennehakemiston polku:" -#: ../vdradmind.pl:303 +#: ../vdradmind.pl:319 msgid "Where are your VDR's configuration files located?" msgstr "Anna VDR-koneesi konfigurointihakemiston polku:" -#: ../vdradmind.pl:309 +#: ../vdradmind.pl:326 msgid "Config file written successfully." msgstr "VDRAdmin-AM konfigurointitiedosto muodostettu." -#: ../vdradmind.pl:362 +#: ../vdradmind.pl:381 #, perl-format msgid "vdradmind.pl %s started with pid %d." msgstr "vdradmind.pl %s käynnistetty prosessitunnisteella %d." -#: ../vdradmind.pl:418 ../vdradmind.pl:1015 ../vdradmind.pl:1947 +#: ../vdradmind.pl:440 ../vdradmind.pl:1038 ../vdradmind.pl:1998 msgid "Not found" msgstr "Ei löydy" -#: ../vdradmind.pl:418 ../vdradmind.pl:1948 +#: ../vdradmind.pl:440 ../vdradmind.pl:1999 msgid "The requested URL was not found on this server!" msgstr "Pyydettyä URL:ia ei löydy palvelimelta!" -#: ../vdradmind.pl:487 ../vdradmind.pl:1011 ../vdradmind.pl:1950 +#: ../vdradmind.pl:510 ../vdradmind.pl:1034 ../vdradmind.pl:2001 msgid "Forbidden" msgstr "Kielletty" -#: ../vdradmind.pl:487 ../vdradmind.pl:1951 +#: ../vdradmind.pl:510 ../vdradmind.pl:2002 msgid "You don't have permission to access this function!" msgstr "Puutteelliset käyttäjäoikeudet haluttuun toimintoon!" -#: ../vdradmind.pl:1011 ../vdradmind.pl:1952 +#: ../vdradmind.pl:1034 ../vdradmind.pl:2003 #, perl-format msgid "Access to file \"%s\" denied!" msgstr "Pääsy tiedostoon \"%s\" evätty!" -#: ../vdradmind.pl:1015 ../vdradmind.pl:1949 +#: ../vdradmind.pl:1038 ../vdradmind.pl:2000 #, perl-format msgid "The URL \"%s\" was not found on this server!" msgstr "URL:ia \"%s\" ei löydy palvelimelta!" -#: ../vdradmind.pl:1953 +#: ../vdradmind.pl:2004 #, perl-format msgid "Can't open file \"%s\"!" msgstr "Tiedoston \"%s\" avaus ei onnistu!" -#: ../vdradmind.pl:1954 +#: ../vdradmind.pl:2005 #, perl-format msgid "" "Can't connect to VDR at %s:%s<br /><br />Please check if VDR is running and " @@ -1811,36 +1815,36 @@ msgstr "" "Yhteydenotto VDR:ään (%s:%s) epäonnistui!<br /><br />Varmista VDR:n " "päälläolo ja svdrphosts.conf-tiedoston oikeellisuus." -#: ../vdradmind.pl:1955 +#: ../vdradmind.pl:2006 #, perl-format msgid "Error while sending command to VDR at %s" msgstr "Komennon lähetys VDR:lle epäonnistui (%s)" -#: ../vdradmind.pl:2637 +#: ../vdradmind.pl:2676 msgid "Playing Tomorrow" msgstr "Ohjelmisto huomenna" -#: ../vdradmind.pl:2637 +#: ../vdradmind.pl:2676 #, perl-format msgid "Playing on the %d." msgstr "Ohjelmisto %d. päivä" -#: ../vdradmind.pl:3981 +#: ../vdradmind.pl:3977 msgid "Suitable matches for:" msgstr "Hakutulokset termille:" -#: ../vdradmind.pl:4036 +#: ../vdradmind.pl:4034 msgid "Schedule" msgstr "Ohjelmisto" -#: ../vdradmind.pl:4559 +#: ../vdradmind.pl:4573 msgid "Playing Today?" msgstr "Tänään" -#: ../vdradmind.pl:4562 +#: ../vdradmind.pl:4573 msgid "Timers" msgstr "Ajastimet" -#: ../vdradmind.pl:4625 +#: ../vdradmind.pl:4641 msgid "System default" msgstr "Oletus" @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: VDRAdmin-AM-3.4.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-04-28 12:15+0200\n" -"PO-Revision-Date: 2006-04-08 23:56+0100\n" +"POT-Creation-Date: 2006-05-11 16:09+0200\n" +"PO-Revision-Date: 2006-04-29 15:51+0100\n" "Last-Translator: Trois Six <trois.six@free.fr>\n" "Language-Team: Trois Six <trois.six@free.fr>\n" "MIME-Version: 1.0\n" @@ -36,7 +36,7 @@ msgstr "charset=ISO-8859-1" #: ../template/default/index.html:21 msgid "Your Browser does not support frames!" -msgstr "Votre Navigateur ne supporte pas les frames !" +msgstr "Votre Navigateur ne supporte pas les cadres !" #: ../template/default/timer_new.html:6 ../template/default/timer_new.html:49 msgid "Create New Timer" @@ -177,7 +177,7 @@ msgstr "Heure De Début :" #: ../template/default/prog_timeline.html:108 #: ../template/default/prog_timeline.html:123 #: ../template/default/at_timer_new.html:111 -#: ../template/default/at_timer_new.html:122 ../vdradmind.pl:3981 +#: ../template/default/at_timer_new.html:122 ../vdradmind.pl:3977 msgid "o'clock" msgstr "Heure" @@ -241,7 +241,7 @@ msgstr "lecture seule" #: ../template/default/timer_new.html:182 msgid "Timer has been set by AutoTimer pattern:" -msgstr "La programmation a été autoprogrammée avec le modèle :" +msgstr "La programmation a été auto-programmée avec le modèle :" #: ../template/default/timer_new.html:195 ../template/default/config.html:659 #: ../template/default/at_timer_new.html:176 @@ -329,7 +329,7 @@ msgstr "Nom" #: ../template/default/timer_list.html:288 #: ../template/default/rec_list.html:95 msgid "Select all/none" -msgstr "Selectionner toutl/rien" +msgstr "Selectionner tout/rien" #: ../template/default/at_timer_list.html:161 #: ../template/default/timer_list.html:354 @@ -362,7 +362,7 @@ msgstr "Supprimer Programmations Sélectionnées ?" #: ../template/default/prog_summary.html:7 #: ../template/default/prog_timeline.html:7 -#: ../template/default/navigation.html:30 ../vdradmind.pl:4558 +#: ../template/default/navigation.html:30 ../vdradmind.pl:4573 msgid "What's On Now?" msgstr "En ce Moment ?" @@ -393,11 +393,11 @@ msgstr "Zapper" #: ../template/default/prog_summary.html:82 msgid "Search for other show times" -msgstr "Rechercher dáautres moments de diffusion" +msgstr "Rechercher d'autres moments de diffusion" #: ../template/default/prog_summary.html:84 msgid "More Information" -msgstr "Plus d'Information" +msgstr "Plus d'Informations" #: ../template/default/prog_summary.html:88 msgid "Record" @@ -487,7 +487,7 @@ msgstr "Mot de Passe Invité :" #: ../template/default/config.html:213 ../template/default/help_config.html:38 #: ../template/default/help_config.html:86 -#: ../template/default/navigation.html:38 ../vdradmind.pl:4560 +#: ../template/default/navigation.html:38 ../vdradmind.pl:4573 msgid "Timeline" msgstr "Chronologie" @@ -756,7 +756,7 @@ msgid "Delete Selected Timers" msgstr "Supprimer Programmations Sélectionnées" #: ../template/default/prog_list.html:6 ../template/default/navigation.html:42 -#: ../vdradmind.pl:4561 +#: ../vdradmind.pl:4573 msgid "Channels" msgstr "Chaînes" @@ -817,12 +817,12 @@ msgstr "rechercher" #: ../template/default/prog_detail.html:52 msgid "Lookup movie in the Internet-Movie-Database (IMDb)" -msgstr "Plus de details sur Internet" +msgstr "Plus de détails sur Internet" #: ../template/default/rec_list.html:6 ../template/default/rec_list.html:18 #: ../template/default/help_rec_list.html:6 #: ../template/default/help_rec_list.html:18 -#: ../template/default/navigation.html:54 ../vdradmind.pl:4563 +#: ../template/default/navigation.html:54 ../vdradmind.pl:4573 msgid "Recordings" msgstr "Enregistrements" @@ -886,7 +886,7 @@ msgid "" "AutoTimers, channel selection and streaming parameters.</p>" msgstr "" "<p>Vous pouvez changer ici les réglages généraux et de base pour les " -"programmations, les Auto-Programmations, la sélection des chaines et les " +"programmations, les Auto-Programmations, la sélection des chaînes et les " "paramétrages de diffusion.</p>" #: ../template/default/help_config.html:43 @@ -895,7 +895,7 @@ msgstr "Le thème que vous désirez utiliser." #: ../template/default/help_config.html:45 msgid "The page you want to see at first connect to VDRAdmin-AM." -msgstr "La page que vous désirez voir à la première connection à VDRAdmin-AM." +msgstr "La page que vous désirez voir à la première connexion à VDRAdmin-AM." #: ../template/default/help_config.html:47 msgid "" @@ -910,8 +910,7 @@ msgstr "" "celles qui ont les champs qui peuvent être sélectionnés. Cela limite aussi " "les Informations EPG. VDRAdmin-AM ne va lire que ce dont il a besoin, ce qui " "va réduire la consommation mémoire et augmenter la performance. <strong>0</" -"strong> désactive cette optionf and VDRAdmin-AM va utiliser toutes les " -"chaines." +"strong> désactive cette option et VDRAdmin-AM va utiliser toutes les chaînes." #: ../template/default/help_config.html:49 msgid "" @@ -921,8 +920,8 @@ msgid "" "\"192.168.0.123\"." msgstr "" "Vous pouvez spécifier ici une adresse IP ou une plage pour laquelle aucune " -"autentification ne sera demandée. Par exemple : \"192.168.0.0/24\" inclura " -"toute adresse commencant par \"192.168.0\", \"192.168.0.123/32\" inclura " +"authentification ne sera demandée. Par exemple : \"192.168.0.0/24\" inclura " +"toute adresse commençant par \"192.168.0\", \"192.168.0.123/32\" inclura " "seulement \"192.168.0.123\"." #: ../template/default/help_config.html:51 @@ -959,7 +958,7 @@ msgid "" "\"ref_menu\">Recordings</span> menu." msgstr "" "Le Chemin vers les enregistrements de VDR. Ceci est utilisé pour que VDR " -"puissse situer les enregistrements lorsque l'on utilise <span class=" +"puisse situer les enregistrements lorsque l'on utilise <span class=" "\"ref_label\">Emission d'Enregistrements</span> et <span class=\"ref_file" "\">reccmds.conf</span> dans le menu <span class=\"ref_menu" "\">Enregistrements</span>." @@ -996,8 +995,8 @@ msgid "" "The guest user cannot modify anything, it's only allowed to view the EPG, " "timers, AutoTimers and recordings listings." msgstr "" -"Si vous voulez un compte utilisateur possedant seulement des droits limités, " -"cei est pour vous. L'utilisateur invité ne peut rien modifier. Il est " +"Si vous voulez un compte utilisateur possédant seulement des droits limités, " +"ceci est pour vous. L'utilisateur invité ne peut rien modifier. Il est " "seulement autoriser à voir le guides électronique des programmes, les " "programmations, les Auto-Programmations et la liste des enregistrements." @@ -1033,7 +1032,7 @@ msgstr "Active ou désactive la fonction d'Auto-Programmation." #: ../template/default/help_config.html:103 msgid "The interval, the the EPG data is checked for updating the AutoTimers." msgstr "" -"L'interval durant lequel les données du guide éléctronique des programmes " +"L'intervalle durant lequel les données du guide éléctronique des programmes " "sont vérifiées pour mettre à jour les Auto-Programmations." #: ../template/default/help_config.html:105 @@ -1056,7 +1055,7 @@ msgid "" "will interrupt the timer with the lowest priority in order to start " "recording." msgstr "" -"Un entier dans l'interval <strong>0...99</strong>, définissant la " +"Un entier dans l'intervalle <strong>0...99</strong>, définissant la " "<strong>priorité</strong> de cette programmation et de l'enregitrement créé " "par cette programmation. <strong>0</strong> représente la valeur la plus " "faible, <strong>99</strong> la plus haute. La priorité est utilisée pour " @@ -1066,9 +1065,9 @@ msgstr "" "utilisée.<br /><br />Cette valeur est aussi stockée avec l'enregistrement, " "et est utilisée plus tard pour décider quel enregistrement doit être " "supprimé du disque pour libérer de la place pour un nouvel enregistrement. " -"Si le disque est plein et qu'un nouvel enregistrement nécéssite plus de " +"Si le disque est plein et qu'un nouvel enregistrement nécessite plus de " "place, un enregistrement avec la plus faible priorité (et dont <strong>durée " -"de vie</strong> ganrantie sera dépassée) sera enlevé.<br /><br />Si toutes " +"de vie</strong> garantie sera dépassée) sera enlevé.<br /><br />Si toutes " "les cartes DVB disponibles sont actuellement occupés, une programmation avec " "une priorité plus élevée interrompra la programmation avec la priorité la " "plus faible pour démarrer l'enregistrement." @@ -1087,7 +1086,7 @@ msgid "" "until the given number of days since the <strong>start</strong> time of the " "recording has passed by." msgstr "" -"La durée de vie <strong>guarantie</strong> (en jours) d'un enregistrement " +"La durée de vie <strong>garantie</strong> (en jours) d'un enregistrement " "créé pas cette programmation. <strong>0</strong> signifie que cet " "enregistrement peut être automatiquement supprimé à n'importe quelle moment " "par un enregistrement avec une priorité plus haute. <strong>99</strong> " @@ -1107,7 +1106,6 @@ msgstr "" "programmée si vous activez cette option." #: ../template/default/help_config.html:111 -#, fuzzy msgid "Here you set the sending email address of the generated email." msgstr "" "Ici vous allez définir le nom de domaine de provenance de l'email généré." @@ -1141,7 +1139,7 @@ msgid "" "timers manually programmed when pressing \"Record\" in any EPG view." msgstr "" "Le nombre de minutes soustraites par VDRAdmin-AM au début de diffusion " -"trouvé dans le guide électronique des programmes. Cette valeur est utilisée " +"trouvée dans le guide électronique des programmes. Cette valeur est utilisée " "pour les programmations d'AutoTimer et les programmations manuelles définies " "par une pression sur \"Enregistrement\" sur tout affichage d'un guide " "électronique des programmes." @@ -1152,9 +1150,8 @@ msgid "" "the EPG. This value is used for timers programmed by AutoTimer and timers " "manually programmed when pressing \"Record\" in any EPG view." msgstr "" -"Le nombre de minutes ajoutés par VDRAdmin-AM à la fin de diffusion trouvé " -"dans le guide électronique des programmes.The number of minutes VDRAdmin-AM " -"adds to the broadcasts stop time found in the EPG. Cette valeur est utilisée " +"Le nombre de minutes ajoutées par VDRAdmin-AM à la fin de la diffusion " +"trouvée dans le guide électronique des programmes. Cette valeur est utilisée " "pour les programmations d'AutoTimer et les programmations manuelles définies " "par une pression sur \"Enregistrement\" sur tout affichage d'un guide " "électronique des programmes." @@ -1193,7 +1190,7 @@ msgid "" "use." msgstr "" "Vous pouvez ici régler le numéro de port sur lequel le serveur streamdev de " -"VDR sera à l'écoute pour toute connection. Additionellement vous pouvez " +"VDR sera à l'écoute pour toute connexion. Additionnellement vous pouvez " "aussi fournir le type de flux que vous désirez utiliser." #: ../template/default/help_config.html:153 @@ -1211,8 +1208,8 @@ msgstr "" "quelle puisse accéder aux enregistrements de VDR. Vous pouvez utiliser par " "exemple Samba or NFS pour cette tâche. VDRAdmin-AM générera simplement une " "liste de lecture qui contiendra tous les enregistrements et l'enverra à " -"votre navigateur. Si votre navigateur et votre lecteur de media sont " -"configurés corectement, vous pourrez voir les enregistrements sur votre " +"votre navigateur. Si votre navigateur et votre lecteur de média sont " +"configurés correctement, vous pourrez voir les enregistrements sur votre " "station." #: ../template/default/help_config.html:155 @@ -1320,7 +1317,7 @@ msgid "to" msgstr "à" #: ../template/default/prog_list2.html:6 -#: ../template/default/navigation.html:34 ../vdradmind.pl:2637 +#: ../template/default/navigation.html:34 ../vdradmind.pl:2676 msgid "Playing Today" msgstr "Joué Aujourd'hui" @@ -1381,12 +1378,12 @@ msgid "" msgstr "" "<p>Ici vous trouverez une liste des programmations connues par VDR.</p><p> " "En haut vous trouverez un graphique montrant les programmations au jour le " -"jour. Cela permet d'apréhender rapidement ce qu'il se passe sur une journée " +"jour. Cela permet d'appréhender rapidement ce qu'il se passe sur une journée " "et vous aide à découvrir les programmations conflictuelles. Survoler avec la " -"souris une programmation permet d'afficher une bulle d'ailde contenant le " +"souris une programmation permet d'afficher une bulle d'aide contenant le " "titre, la priorité, la durée de vie, la durée de celle-ci.</p><p> En dessous " -"du graph, vous trouverez une liste des programmations montrant quelques " -"informations sur les programmations. Vous pouvez chanfer l'ordre d'affichage " +"du graphe, vous trouverez une liste des programmations montrant quelques " +"informations sur les programmations. Vous pouvez changer l'ordre d'affichage " "en cliquant sur les descriptions des colonnes.</p><p> Pour chaque " "enregistrement, vous avez les options suivantes : <dl><dt> Changer son état " "</dt><dd> En cliquant sur \"Oui\", \"Non\", \"VPS\" or \"Auto\" dans la " @@ -1420,7 +1417,7 @@ msgstr "" "plusieurs programmations dans la dernière coloone de ces programmations et " "en cliquant sur <input type=\"submit\" class=\"submit\" value=\"Supprimer " "les Programmations Sélectionnées\"/>.</p><p> Vous pouvez <input type=\"submit" -"\" class=\"submit\" value=\"activater\"/> et <input type=\"submit\" class=" +"\" class=\"submit\" value=\"activer\"/> et <input type=\"submit\" class=" "\"submit\" value=\"désactiver\"/> les programmations sélectionnées.</p>" #: ../template/default/help_timer_new.html:32 @@ -1467,7 +1464,7 @@ msgstr "Ne surveille pas cette programmation." #: ../template/default/help_timer_new.html:48 msgid "The channel to record." -msgstr "La chaine à enregistrer." +msgstr "La chaîne à enregistrer." #: ../template/default/help_timer_new.html:50 msgid "" @@ -1519,7 +1516,7 @@ msgstr "" "devraient être délimités par '~' (le caractère '/' peut faire partie du nom " "d'un programme).<br /><br /> Si les mots clé <strong> TITLE </strong> et/ou " "<strong> EPISODE</strong> sont présents, ils seront remplacés par le titre " -"et l'information sur l'episode contenue dans les données EPG présentes au " +"et l'information sur l'épisode contenue dans les données EPG présentes au " "moment du lancement de l'enregistrement (si ces données existent). Si au " "moment de l'enregistrement ces variables ne peuvent être définies, <strong> " "TITLE </strong> sera remplacé par le nom de la chaîne, et <strong> EPISODE </" @@ -1574,13 +1571,13 @@ msgstr "" "Programmation Automatique en cliquant sur<img src=\"bilder/edit.gif\" alt=" "\"editer\" />.</dd><dt> Supprimer une Programmation Automatique </dt><dd> " "Pour supprimer une Programmation Automatique vous devez cliquer sur <img src=" -"\"bilder/delete.gif\" alt=\"supprimer\" />.</dd></dl></p><p> Les étas de " +"\"bilder/delete.gif\" alt=\"supprimer\" />.</dd></dl></p><p> Les états de " "toutes les Programmations Automatiques sont indiqués par des images de " "couleurs différentes : <br /><img src=\"bilder/poempl_gruen.gif\" alt=\"on\" " "align=\"middle\" /> La Programmation Automatique est OK and se programmera " "automatiquement.<br /><img src=\"bilder/poempl_grau.gif\" alt=\"inactivée\" " "align=\"middle\" /> La Programmation Automatique n'est pas activée.</p><p> " -"En plus de ces fontions vous pouvez ajouter une nouvelle Programmation " +"En plus de ces fonctions vous pouvez ajouter une nouvelle Programmation " "Automatique en cliquant sur <input type=\"submit\" class=\"submit\" value=" "\"Nouvelle Programmation Automatique\"/> en haut et vous pouvez supprimer " "plusieurs Programmations Automatiques en cochant les case dans la dernière " @@ -1607,7 +1604,7 @@ msgid "" "VDR automatically for that broadcast. That's very comfortable for " "irregularly broadcasted series or movies you don't want to miss.</p>" msgstr "" -"<p>Ici vous pouvez édier les paramètres d'une programmation automatique " +"<p>Ici vous pouvez éditer les paramètres d'une programmation automatique " "(AutoTimer). </p><p>Les Programmations Automatiques sont une fonction clé de " "VDRAdmin-AM. Une Programmation Automatique consiste en un ou plusieurs " "motifs et d'autres paramètres, qui sont recherchés dans l'Electronic Program " @@ -1633,7 +1630,7 @@ msgstr "" "aussi elles peuvent être activées à tout moment, mais cependant elles " "n'enregistre rien. Au dessus vous pouvez régler ceci à \"Une Fois\", donc " "cette Auto-Programmation programme seulement la prochaine (et unique!) " -"occurence de la diffusion." +"occurrence de la diffusion." #: ../template/default/help_at_timer_new.html:40 #: ../template/default/at_timer_new.html:61 @@ -1665,21 +1662,21 @@ msgstr "" "rien ne sera enregistré.<br />La Casse n'est pas importante, \"X-Files\" " "concorde avec tout ce que \"x-files\" fera concorder. Vous pouvez régler de " "multiples critères de recherche en les séparants par des espaces. Les " -"diffusions concorderont seulement sielles contiennent <strong>tous</strong> " -"les critères.<br />Utiliser de preférence uniquement des chiffres et des " -"lettres, car l'EPG ommet souvent les virgules, parentheses, et autres " +"diffusions concorderont seulement si elles contiennent <strong>tous</strong> " +"les critères.<br />Utiliser de préférence uniquement des chiffres et des " +"lettres, car l'EPG omet souvent les virgules, parenthèses, et autres " "caractères.<br />Les experts peuvent aussi utiliser les expressions " "régulières, mais vous devrez étudier les sources de VDRAdmin-AM " "(fonctionnalité non documentée).<br /><br />Vous pouvez exclure des " -"duffusions et donc elle ne seront pas enregistré même si elle concordent " +"diffusions et donc elle ne seront pas enregistré même si elle concordent " "avec une Auto-Programmation. Néanmoins vous devez entrer ses titres dans le " -"fichier <i>vdradmind.bl</i>, un evènement par ligne. Ce fichier doit être " -"situé dans votre répertoire de configuration de VDRAdmin-AM. Si cette chaine " +"fichier <i>vdradmind.bl</i>, un évènement par ligne. Ce fichier doit être " +"situé dans votre répertoire de configuration de VDRAdmin-AM. Si cette chaîne " "de caractères est trouvé soit dans <u>titre</u> ou dans <u>titre~soustitre</" "u>de l'EPG, cet évenement ne sera pas programmé. Donc sous pouvez désactivé " -"des épisodes complets (par exemple en utilisant \"Enterprise\" comme chaine " +"des épisodes complets (par exemple en utilisant \"Enterprise\" comme chaîne " "de caractère) ou seulement un épisode (en utilisant \"Enterprise~Azati Prime" -"\" comme chaine de caractères)." +"\" comme chaîne de caractères)." #: ../template/default/help_at_timer_new.html:42 #: ../template/default/at_timer_new.html:69 @@ -1691,7 +1688,7 @@ msgid "" "Here you can define the EPG sections where VDRAdmin-AM should look for the " "search pattern." msgstr "" -"Ici, vous pouvez définir les sections du guide éléctronique des programmes " +"Ici, vous pouvez définir les sections du guide électronique des programmes " "où VDRAdmin-AM recherchera le motif de recherche." #: ../template/default/help_at_timer_new.html:44 @@ -1713,9 +1710,9 @@ msgid "" "known or wanted channels. You can define the wanted channels for AutoTimer " "in \"Configuration\"." msgstr "" -"La chaine à rechercher pour des diffusion concordantes ou \"toutes\" pour " -"rechercher dans toutes les chaines connues ou désirées. Vous pouvez définir " -"les chaines désirées pour l'Auto-programmation dans \"Configuration\"." +"La chaîne à rechercher pour des diffusion concordantes ou \"toutes\" pour " +"rechercher dans toutes les chaînes connues ou désirées. Vous pouvez définir " +"les chaînes désirées pour l'Auto-programmation dans \"Configuration\"." #: ../template/default/help_at_timer_new.html:48 #: ../template/default/at_timer_new.html:106 @@ -1804,7 +1801,7 @@ msgstr "" "Le répertoire où cette Programmation Automatique va placer les " "enregistrements. Si le nom devait contenir des sous répertoires, ceux-ci " "devraient être délimités par le caractère '~' (le caractère '/' peut faire " -"partie du nom d'un executable).<br />VDRAdmin-AM ajoutera le titre et le " +"partie du nom d'un exécutable).<br />VDRAdmin-AM ajoutera le titre et le " "sous-titre (si la case \"Episode\" est cochée) du programme diffusé à ce nom." "<br /><br />Vous pouvez aussi utiliser d'autres noms clé qui sont remplacés " "par les valeurs fournies par exemple par <a href=\"http://tvmovie2vdr.vdr-" @@ -1864,7 +1861,7 @@ msgstr "" "montrera aussi les espaces disques utilisés en libres selon VDR.</p><p>La " "liste vous montre certaines informations sur les enregistrements. Vous " "pouvez changer l'ordre ce cette liste en cliquant sur la description de la " -"colonne. Au desssus de la liste vous verrez le chemin de navigation. Si vous " +"colonne. Au dessus de la liste vous verrez le chemin de navigation. Si vous " "voulez voir le contenu des répertoires précédents vous devrez cliquant sur " "leurs noms dans le chemin.</p><p> Chaque ligne contient ces informations : " "<dl><dt>Date</dt><dd>La Date de création de l'enregistrement. Dans le cas " @@ -1876,14 +1873,14 @@ msgstr "" "l'enregistrement ou naviguer dans le répertoire.</dd><dt>Renommer (<img src=" "\"bilder/edit.gif\" alt=\"editer\" />)</dt><dd>Renommer un enregistrement." "<br /><h4> Remarque : </h4> Cele ne marque que si VDR a la commande SVDRPort " -"<u>RENR</u> qui ne fait pas partie de base de VDR feature mais qui peut être " -"ajouter grâce à un patch. <span class=\"ref_file\">vdr-aio21_svdrprename." -"patch</span> ou <span class=\"ref_file\">enAIO-v2.2+</span> permettent " -"d'ajouter cette commande.</dd><dt>Supprimer (<img src=\"bilder/delete.gif\" " -"alt=\"supprimer\" />)</dt><dd>Supprimer un enregistrement.</dd><dt>Emettre " -"un flux (<img src=\"bilder/stream.gif\" alt=\"stream\" />)</dt><dd>Cette " +"<u>RENR</u> qui ne fait pas partie de base de VDR mais qui peut être ajouter " +"grâce à un patch. <span class=\"ref_file\">vdr-aio21_svdrprename.patch</" +"span> ou <span class=\"ref_file\">enAIO-v2.2+</span> permettent d'ajouter " +"cette commande.</dd><dt>Supprimer (<img src=\"bilder/delete.gif\" alt=" +"\"supprimer\" />)</dt><dd>Supprimer un enregistrement.</dd><dt>Emettre un " +"flux (<img src=\"bilder/stream.gif\" alt=\"stream\" />)</dt><dd>Cette " "colonne n'est visible que si vous avez activé et configuré <span class=" -"\"ref_label\">L'emission de Flux d'Enregistrement</span> dans le menu de " +"\"ref_label\">L'émission de Flux d'Enregistrement</span> dans le menu de " "<span class=\"ref_menu\">Configuration</span>. Vous pouvez regarder " "l'enregistrement sur votre station de travail.</dd></dl></p><p>En plus de " "ces fonctions vous pouvez supprimer plusieurs enregistrements en même temps " @@ -1891,7 +1888,7 @@ msgstr "" "<input type=\"submit\" class=\"submit\" value=\"Supprimer les " "Enregistrements Sélectionnés\"/>.</p><p>Si vous avez défini le chemin des " "fichiers de configuration de VDR et que vous avez des entrées dans le <span " -"class=\"ref_file\">reccmds.conf</span> de VDR vous pouvez éxecuter ces " +"class=\"ref_file\">reccmds.conf</span> de VDR vous pouvez exécuter ces " "commandes pour les enregistrements sélectionnées en sélectionnant la " "commande désirée dans la liste de sélection située près de <span class=" "\"ref_label\"> Commandes : </span> et en pressant sur le bouton <input type=" @@ -1974,7 +1971,7 @@ msgstr "Auteur du programme (VDRAdmin) :" #: ../template/default/about.html:48 msgid "Translation Team" -msgstr "Equipe de Traduction" +msgstr "Équipe de Traduction" #: ../template/default/about.html:58 msgid "Dutch:" @@ -2004,23 +2001,27 @@ msgstr "Allemand :" msgid "Spanish:" msgstr "Espagnol :" -#: ../template/default/about.html:102 +#: ../template/default/about.html:94 +msgid "Russian:" +msgstr "" + +#: ../template/default/about.html:108 msgid "Informations" msgstr "Informations" -#: ../template/default/about.html:112 +#: ../template/default/about.html:118 msgid "VDRAdmin-AM version:" msgstr "Version de VDRAdmin-AM :" -#: ../template/default/about.html:118 +#: ../template/default/about.html:124 msgid "VDR version:" msgstr "Version de VDR :" -#: ../template/default/about.html:132 +#: ../template/default/about.html:138 msgid "Getting Help and Reporting Bugs" msgstr "Avoir de l'Aide et Rapporter les Bugs" -#: ../template/default/about.html:144 +#: ../template/default/about.html:150 msgid "" "If you need help please first try to use the online help you'll find on some " "pages. You can access it by clicking <img src=\"bilder/help.gif\"/>." @@ -2028,7 +2029,7 @@ msgstr "" "Si vous avez besoin d'aide, merci de regarder en priorité sur l'aide en " "ligne. Ici <img src=\"bilder/help.gif\"/>." -#: ../template/default/about.html:145 +#: ../template/default/about.html:151 msgid "" "If this doesn't provide the information you need you can try to get help at " "<a href=\"http://www.vdrportal.de\" target=\"_blank\">VDR-Portal</a> if you " @@ -2040,7 +2041,7 @@ msgstr "" "\">VDR-Portal</a> si vous comprenez l'allemand. Merci d'utiliser le topic de " "l'annonce si possible, recherchez : " -#: ../template/default/about.html:146 +#: ../template/default/about.html:152 msgid "" "If you think you have found a bug please check that it's a new one and " "report it in the <a href=\"http://www.vdr-developer.org/mantisbt/main_page." @@ -2056,7 +2057,7 @@ msgstr "Nombre de lignes à montrer :" #: ../template/default/vdr_cmds.html:49 msgid "unlimited" -msgstr "illlimité" +msgstr "illimité" #: ../template/default/vdr_cmds.html:56 msgid "SVDRP commands:" @@ -2070,116 +2071,118 @@ msgstr "Commandes définies dans commands.conf :" msgid "Output" msgstr "Sortie" -#: ../vdradmind.pl:296 +#: ../vdradmind.pl:312 msgid "What's your VDR hostname (e.g video.intra.net)?" -msgstr "Quel est votre Nom d'Hôte (ex video.intra.net) ?" +msgstr "Quel est votre Nom d'hôte (ex video.intra.net) ?" -#: ../vdradmind.pl:297 +#: ../vdradmind.pl:313 msgid "On which port does VDR listen to SVDRP queries?" msgstr "Sur quel port VDR écoute les requêtes SVDRP ?" -#: ../vdradmind.pl:298 +#: ../vdradmind.pl:314 msgid "On which address should VDRAdmin-AM listen (0.0.0.0 for any)?" msgstr "Sur quelle adresse VDRAdmin-AM doit-il écouter (0.0.0.0 pour toutes) ?" -#: ../vdradmind.pl:299 +#: ../vdradmind.pl:315 msgid "On which port should VDRAdmin-AM listen?" msgstr "Sur quel port VDRAdmin-AM doit-il écouter ?" -#: ../vdradmind.pl:300 +#: ../vdradmind.pl:316 msgid "Username?" msgstr "Identifiant ?" -#: ../vdradmind.pl:301 +#: ../vdradmind.pl:317 msgid "Password?" msgstr "Mot de Passe ?" -#: ../vdradmind.pl:302 +#: ../vdradmind.pl:318 msgid "Where are your recordings stored?" msgstr "Où vos enregistrements sont-ils stockés ?" -#: ../vdradmind.pl:303 +#: ../vdradmind.pl:319 msgid "Where are your VDR's configuration files located?" msgstr "Où sont vos fichiers de configuration de VDR ?" -#: ../vdradmind.pl:309 +#: ../vdradmind.pl:326 msgid "Config file written successfully." msgstr "Fichier de configuration écrit avec succès." -#: ../vdradmind.pl:362 +#: ../vdradmind.pl:381 #, perl-format msgid "vdradmind.pl %s started with pid %d." msgstr "vdradmin.pl %s a démarré avec le pid %d." -#: ../vdradmind.pl:418 ../vdradmind.pl:1015 ../vdradmind.pl:1947 +#: ../vdradmind.pl:440 ../vdradmind.pl:1038 ../vdradmind.pl:1998 msgid "Not found" msgstr "Non trouvé" -#: ../vdradmind.pl:418 ../vdradmind.pl:1948 +#: ../vdradmind.pl:440 ../vdradmind.pl:1999 msgid "The requested URL was not found on this server!" msgstr "L'URL demandée n'a pas été trouvée sur le serveur !" -#: ../vdradmind.pl:487 ../vdradmind.pl:1011 ../vdradmind.pl:1950 +#: ../vdradmind.pl:510 ../vdradmind.pl:1034 ../vdradmind.pl:2001 msgid "Forbidden" msgstr "Interdit" -#: ../vdradmind.pl:487 ../vdradmind.pl:1951 +#: ../vdradmind.pl:510 ../vdradmind.pl:2002 msgid "You don't have permission to access this function!" msgstr "Vous n'avez pas la permission d'accéder à cette fonction !" -#: ../vdradmind.pl:1011 ../vdradmind.pl:1952 +#: ../vdradmind.pl:1034 ../vdradmind.pl:2003 #, perl-format msgid "Access to file \"%s\" denied!" msgstr "Accès au fichier \"%s\" interdit !" -#: ../vdradmind.pl:1015 ../vdradmind.pl:1949 +#: ../vdradmind.pl:1038 ../vdradmind.pl:2000 #, perl-format msgid "The URL \"%s\" was not found on this server!" msgstr "L'URL \"%s\" n'a pas été trouvée sur le serveur !" -#: ../vdradmind.pl:1953 +#: ../vdradmind.pl:2004 #, perl-format msgid "Can't open file \"%s\"!" msgstr "Ne peut pas ouvrir le fichier \"%s\" !" -#: ../vdradmind.pl:1954 +#: ../vdradmind.pl:2005 #, perl-format msgid "" "Can't connect to VDR at %s:%s<br /><br />Please check if VDR is running and " "if VDR's svdrphosts.conf is configured correctly." msgstr "" +"Connexion impossible vers VDR %s:%s<br /><br />Merci de vérifier que VDR est " +"lancé et que le fichier svdrphosts.conf est configuré correctement." -#: ../vdradmind.pl:1955 +#: ../vdradmind.pl:2006 #, perl-format msgid "Error while sending command to VDR at %s" msgstr "Erreur en envoyant la commande à %s" -#: ../vdradmind.pl:2637 +#: ../vdradmind.pl:2676 msgid "Playing Tomorrow" msgstr "Joué demain" -#: ../vdradmind.pl:2637 +#: ../vdradmind.pl:2676 #, perl-format msgid "Playing on the %d." msgstr "En cours sur la %d." -#: ../vdradmind.pl:3981 +#: ../vdradmind.pl:3977 msgid "Suitable matches for:" msgstr "Correspondances trouvées pour :" -#: ../vdradmind.pl:4036 +#: ../vdradmind.pl:4034 msgid "Schedule" msgstr "Programmateur" -#: ../vdradmind.pl:4559 +#: ../vdradmind.pl:4573 msgid "Playing Today?" msgstr "Aujourd'hui ?" -#: ../vdradmind.pl:4562 +#: ../vdradmind.pl:4573 msgid "Timers" msgstr "Programmations" -#: ../vdradmind.pl:4625 +#: ../vdradmind.pl:4641 msgid "System default" msgstr "Par défaut" diff --git a/po/fr.po.orig b/po/fr.po.orig deleted file mode 100644 index 11792ae..0000000 --- a/po/fr.po.orig +++ /dev/null @@ -1,2181 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: VDRAdmin-AM-3.4.4\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-04-10 08:45+0200\n" -"PO-Revision-Date: 2006-04-08 23:56+0100\n" -"Last-Translator: Trois Six <trois.six@free.fr>\n" -"Language-Team: Trois Six <trois.six@free.fr>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=iso-8859-1\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Poedit-Language: French\n" -"X-Poedit-Country: FRANCE\n" - -#: ../template/default/noperm.html:4 ../template/default/index.html:5 -#: ../template/default/timer_new.html:5 ../template/default/help_no.html:5 -#: ../template/default/rc.html:5 ../template/default/noauth.html:4 -#: ../template/default/at_timer_list.html:5 -#: ../template/default/prog_summary.html:6 ../template/default/config.html:4 -#: ../template/default/timer_list.html:5 ../template/default/prog_list.html:5 -#: ../template/default/error.html:5 ../template/default/tv.html:6 -#: ../template/default/prog_detail.html:5 ../template/default/rec_list.html:5 -#: ../template/default/help_config.html:8 -#: ../template/default/prog_timeline.html:6 -#: ../template/default/prog_list2.html:5 ../template/default/rec_edit.html:5 -#: ../template/default/help_timer_list.html:5 -#: ../template/default/help_timer_new.html:8 -#: ../template/default/help_at_timer_list.html:5 -#: ../template/default/help_at_timer_new.html:11 -#: ../template/default/help_rec_list.html:5 -#: ../template/default/at_timer_new.html:5 -#: ../template/default/navigation.html:4 ../template/default/about.html:5 -#: ../template/default/vdr_cmds.html:5 -msgid "charset=ISO-8859-1" -msgstr "charset=ISO-8859-1" - -#: ../template/default/index.html:21 -msgid "Your Browser does not support frames!" -msgstr "Votre Navigateur ne supporte pas les frames !" - -#: ../template/default/timer_new.html:6 ../template/default/timer_new.html:49 -msgid "Create New Timer" -msgstr "Créer Nouvelle Programmation" - -#: ../template/default/timer_new.html:6 ../template/default/timer_new.html:49 -#: ../template/default/help_timer_new.html:9 -#: ../template/default/help_timer_new.html:21 -msgid "Edit Timer" -msgstr "Editer Programmation" - -#: ../template/default/timer_new.html:53 -#: ../template/default/at_timer_list.html:44 -#: ../template/default/config.html:23 ../template/default/timer_list.html:51 -#: ../template/default/rec_list.html:27 -#: ../template/default/at_timer_new.html:24 -#: ../template/default/navigation.html:74 ../template/default/vdr_cmds.html:21 -msgid "Help" -msgstr "Aide" - -#: ../template/default/timer_new.html:73 -#: ../template/default/help_timer_new.html:34 -msgid "Timer Active:" -msgstr "Programmation Active :" - -#: ../template/default/timer_new.html:75 -#: ../template/default/at_timer_list.html:133 -#: ../template/default/config.html:186 ../template/default/config.html:237 -#: ../template/default/config.html:266 ../template/default/config.html:307 -#: ../template/default/config.html:346 ../template/default/config.html:397 -#: ../template/default/config.html:406 ../template/default/config.html:415 -#: ../template/default/config.html:443 ../template/default/config.html:458 -#: ../template/default/config.html:530 ../template/default/config.html:545 -#: ../template/default/config.html:576 ../template/default/config.html:585 -#: ../template/default/config.html:594 ../template/default/config.html:603 -#: ../template/default/config.html:612 ../template/default/config.html:621 -#: ../template/default/timer_list.html:324 -#: ../template/default/at_timer_new.html:48 -#: ../template/default/at_timer_new.html:52 -#: ../template/default/at_timer_new.html:154 -msgid "Yes" -msgstr "Oui" - -#: ../template/default/timer_new.html:76 -#: ../template/default/at_timer_list.html:135 -#: ../template/default/config.html:187 ../template/default/config.html:238 -#: ../template/default/config.html:267 ../template/default/config.html:308 -#: ../template/default/config.html:347 ../template/default/config.html:398 -#: ../template/default/config.html:407 ../template/default/config.html:416 -#: ../template/default/config.html:444 ../template/default/config.html:459 -#: ../template/default/config.html:531 ../template/default/config.html:546 -#: ../template/default/config.html:577 ../template/default/config.html:586 -#: ../template/default/config.html:595 ../template/default/config.html:604 -#: ../template/default/config.html:613 ../template/default/config.html:622 -#: ../template/default/timer_list.html:325 -#: ../template/default/at_timer_new.html:49 -#: ../template/default/at_timer_new.html:53 -#: ../template/default/at_timer_new.html:155 -msgid "No" -msgstr "Non" - -#: ../template/default/timer_new.html:82 -#: ../template/default/help_timer_new.html:36 -msgid "AutoTimer Checking:" -msgstr "Vérification Auto-Programmation :" - -#: ../template/default/timer_new.html:86 -#: ../template/default/help_timer_new.html:39 -msgid "Transmission Identification" -msgstr "Identification Transmission" - -#: ../template/default/timer_new.html:88 ../template/default/rec_list.html:70 -#: ../template/default/help_timer_new.html:41 -msgid "Time" -msgstr "Horaires" - -#: ../template/default/timer_new.html:89 ../template/default/tv.html:192 -#: ../template/default/help_timer_new.html:43 -msgid "off" -msgstr "off" - -#: ../template/default/timer_new.html:95 ../template/default/prog_list.html:27 -#: ../template/default/help_timer_new.html:47 -#: ../template/default/help_at_timer_new.html:46 -#: ../template/default/at_timer_new.html:93 -msgid "Channel:" -msgstr "Chaîne :" - -#: ../template/default/timer_new.html:107 -#: ../template/default/help_timer_new.html:49 -msgid "Day Of Recording:" -msgstr "Jour d'Enregistrement :" - -#: ../template/default/timer_new.html:111 -#: ../template/default/at_timer_new.html:81 -msgid "Monday" -msgstr "Lundi" - -#: ../template/default/timer_new.html:112 -#: ../template/default/at_timer_new.html:82 -msgid "Tuesday" -msgstr "Mardi" - -#: ../template/default/timer_new.html:113 -#: ../template/default/at_timer_new.html:83 -msgid "Wednesday" -msgstr "Mercredi" - -#: ../template/default/timer_new.html:114 -#: ../template/default/at_timer_new.html:84 -msgid "Thursday" -msgstr "Jeudi" - -#: ../template/default/timer_new.html:115 -#: ../template/default/at_timer_new.html:85 -msgid "Friday" -msgstr "Vendredi" - -#: ../template/default/timer_new.html:116 -#: ../template/default/at_timer_new.html:86 -msgid "Saturday" -msgstr "Samedi" - -#: ../template/default/timer_new.html:117 -#: ../template/default/at_timer_new.html:87 -msgid "Sunday" -msgstr "Dimanche" - -#: ../template/default/timer_new.html:123 -#: ../template/default/help_timer_new.html:57 -msgid "Start Time:" -msgstr "Heure De Début :" - -#: ../template/default/timer_new.html:128 -#: ../template/default/timer_new.html:142 -#: ../template/default/prog_summary.html:26 -#: ../template/default/prog_timeline.html:96 -#: ../template/default/prog_timeline.html:109 -#: ../template/default/prog_timeline.html:124 -#: ../template/default/at_timer_new.html:111 -#: ../template/default/at_timer_new.html:122 ../vdradmind.pl:3947 -msgid "o'clock" -msgstr "Heure" - -#: ../template/default/timer_new.html:130 -#: ../template/default/timer_new.html:144 -msgid "Buffer:" -msgstr "Tampon :" - -#: ../template/default/timer_new.html:130 -#: ../template/default/timer_new.html:144 ../template/default/config.html:274 -#: ../template/default/config.html:384 ../template/default/config.html:390 -msgid "minutes" -msgstr "minutes" - -#: ../template/default/timer_new.html:137 -#: ../template/default/help_timer_new.html:59 -msgid "End Time:" -msgstr "Heure De Fin :" - -#: ../template/default/timer_new.html:151 -msgid "Use VPS:" -msgstr "Utiliser VPS :" - -#: ../template/default/timer_new.html:157 -#: ../template/default/at_timer_list.html:24 -#: ../template/default/config.html:279 ../template/default/config.html:371 -#: ../template/default/timer_list.html:27 -#: ../template/default/help_config.html:104 -#: ../template/default/help_config.html:128 -#: ../template/default/help_timer_new.html:61 -#: ../template/default/help_at_timer_new.html:52 -#: ../template/default/at_timer_new.html:128 -msgid "Priority:" -msgstr "Priorité :" - -#: ../template/default/timer_new.html:163 -#: ../template/default/at_timer_list.html:24 -#: ../template/default/config.html:285 ../template/default/config.html:377 -#: ../template/default/timer_list.html:27 -#: ../template/default/help_config.html:106 -#: ../template/default/help_config.html:130 -#: ../template/default/help_timer_new.html:63 -#: ../template/default/help_at_timer_new.html:54 -#: ../template/default/at_timer_new.html:136 -msgid "Lifetime:" -msgstr "Chronologie :" - -#: ../template/default/timer_new.html:169 -#: ../template/default/help_timer_new.html:65 -msgid "Title of Recording:" -msgstr "Titre de l'Enregistrement :" - -#: ../template/default/timer_new.html:175 ../template/default/rec_edit.html:57 -#: ../template/default/help_timer_new.html:67 -msgid "Summary:" -msgstr "Résumé :" - -#: ../template/default/timer_new.html:175 -msgid "readonly" -msgstr "lecture seule" - -#: ../template/default/timer_new.html:182 -msgid "Timer has been set by AutoTimer pattern:" -msgstr "La programmation a été autoprogrammée avec le modèle :" - -#: ../template/default/timer_new.html:195 ../template/default/config.html:659 -#: ../template/default/at_timer_new.html:176 -msgid "Save" -msgstr "Enregistrer" - -#: ../template/default/timer_new.html:196 ../template/default/rec_edit.html:70 -#: ../template/default/at_timer_new.html:178 -msgid "Cancel" -msgstr "Annuler" - -#: ../template/default/help_no.html:6 ../template/default/help_no.html:18 -msgid "No Help Available" -msgstr "Pas d'aide disponible" - -#: ../template/default/help_no.html:29 -msgid "" -"<p>No help available yet. For adding or changing text please contact <a href=" -"\"mailto:mail@andreas.vdr-developer.org\">mail@andreas.vdr-developer.org</a>." -"</p>" -msgstr "" -"<p>Aucune aide n'est disponible. Pour ajouter ou changer du texte contactez " -"<a href=\"mailto:mail@andreas.vdr-developer.org\">mail@andreas.vdr-developer." -"org.</a>.</p>" - -#: ../template/default/rc.html:6 ../template/default/navigation.html:58 -msgid "Remote Control" -msgstr "Télécommande" - -#: ../template/default/noauth.html:5 ../template/default/noauth.html:14 -msgid "Authorization Required" -msgstr "Autorisation Requise" - -#: ../template/default/noauth.html:15 -msgid "" -"This server could not verify that you are authorized to access the document " -"requested. Either you supplied the wrong credentials (e.g. bad password), or " -"your browser doesn't understand how to supply the credentials required." -msgstr "" -"Le serveur n'a pas pu vérifier que vous êtes autorisé à accéder au document " -"demandé. Ou vous avez fourni de mauvaises informations (par ex. mauvais mot " -"de passe), ou votre navigateur n'a pu fournir les informations requises." - -#: ../template/default/at_timer_list.html:6 -#: ../template/default/at_timer_list.html:36 -#: ../template/default/config.html:254 ../template/default/help_config.html:38 -#: ../template/default/help_config.html:98 -#: ../template/default/help_at_timer_list.html:6 -#: ../template/default/help_at_timer_list.html:22 -#: ../template/default/navigation.html:50 -msgid "AutoTimer" -msgstr "Auto-Programmation" - -#: ../template/default/at_timer_list.html:39 -msgid "New AutoTimer" -msgstr "Nouvelle Auto-Programmation" - -#: ../template/default/at_timer_list.html:58 -#: ../template/default/timer_list.html:222 -msgid "Active" -msgstr "Actif" - -#: ../template/default/at_timer_list.html:69 -#: ../template/default/timer_list.html:233 -msgid "Channel" -msgstr "Chaîne" - -#: ../template/default/at_timer_list.html:80 -#: ../template/default/timer_list.html:255 -msgid "Start" -msgstr "Début" - -#: ../template/default/at_timer_list.html:91 -#: ../template/default/timer_list.html:266 -msgid "Stop" -msgstr "Fin" - -#: ../template/default/at_timer_list.html:102 -#: ../template/default/timer_list.html:277 -#: ../template/default/rec_list.html:81 -msgid "Name" -msgstr "Nom" - -#: ../template/default/at_timer_list.html:113 -#: ../template/default/timer_list.html:288 -#: ../template/default/rec_list.html:95 -msgid "Select all/none" -msgstr "Selectionner toutl/rien" - -#: ../template/default/at_timer_list.html:161 -#: ../template/default/timer_list.html:354 -msgid "Edit" -msgstr "Editer" - -#: ../template/default/at_timer_list.html:166 -#: ../template/default/timer_list.html:357 -msgid "Delete timer?" -msgstr "Supprimer Programmation ?" - -#: ../template/default/at_timer_list.html:166 -#: ../template/default/timer_list.html:357 -#: ../template/default/rec_list.html:140 -msgid "Delete" -msgstr "Supprimer" - -#: ../template/default/at_timer_list.html:193 -msgid "Force Update" -msgstr "Forcer Mise à jour" - -#: ../template/default/at_timer_list.html:196 -msgid "Delete Selected AutoTimers" -msgstr "Supprimer Auto-Programmations Sélectionnées" - -#: ../template/default/at_timer_list.html:196 -#: ../template/default/timer_list.html:387 -msgid "Delete all selected timers?" -msgstr "Supprimer Programmations Sélectionnées ?" - -#: ../template/default/prog_summary.html:7 -#: ../template/default/prog_timeline.html:7 -#: ../template/default/navigation.html:30 ../vdradmind.pl:4524 -msgid "What's On Now?" -msgstr "En ce Moment ?" - -#: ../template/default/prog_summary.html:24 -#: ../template/default/prog_timeline.html:99 -msgid "What's on:" -msgstr "En ce moment :" - -#: ../template/default/prog_summary.html:24 -#: ../template/default/prog_timeline.html:101 -msgid "now" -msgstr "maintenant" - -#: ../template/default/prog_summary.html:24 -#: ../template/default/prog_timeline.html:107 -msgid "at:" -msgstr "à :" - -#: ../template/default/prog_summary.html:43 -#: ../template/default/prog_list.html:23 ../template/default/rec_list.html:146 -#: ../template/default/prog_list2.html:56 -msgid "Stream" -msgstr "Flux" - -#: ../template/default/prog_summary.html:81 -msgid "TV select" -msgstr "Zapper" - -#: ../template/default/prog_summary.html:82 -msgid "Search for other show times" -msgstr "Rechercher dáautres moments de diffusion" - -#: ../template/default/prog_summary.html:84 -msgid "More Information" -msgstr "Plus d'Information" - -#: ../template/default/prog_summary.html:88 -msgid "Record" -msgstr "Enregistrer" - -#: ../template/default/config.html:5 ../template/default/config.html:19 -#: ../template/default/help_config.html:9 -#: ../template/default/help_config.html:25 -#: ../template/default/navigation.html:70 -msgid "Configuration" -msgstr "Configuration" - -#: ../template/default/config.html:36 ../template/default/help_config.html:38 -#: ../template/default/help_config.html:40 -msgid "General Settings" -msgstr "Paramètres Généraux" - -#: ../template/default/config.html:47 -msgid "Template:" -msgstr "Gabarit :" - -#: ../template/default/config.html:60 ../template/default/help_config.html:42 -msgid "Skin:" -msgstr "Thème :" - -#: ../template/default/config.html:72 ../template/default/help_config.html:44 -msgid "Login Page:" -msgstr "Page de Démarrage :" - -#: ../template/default/config.html:84 ../template/default/help_config.html:46 -msgid "Number of channels to use:" -msgstr "Nombre de chaînes à utiliser :" - -#: ../template/default/config.html:90 ../template/default/help_config.html:48 -msgid "Local net (no login required):" -msgstr "Réseau local (login non nécessaire) :" - -#: ../template/default/config.html:96 ../template/default/help_config.html:50 -msgid "Language:" -msgstr "Langue :" - -#: ../template/default/config.html:120 ../template/default/help_config.html:38 -#: ../template/default/help_config.html:56 -msgid "VDR" -msgstr "VDR" - -#: ../template/default/config.html:130 ../template/default/help_config.html:58 -msgid "Number of DVB cards:" -msgstr "Nbre de Cartes DVB :" - -#: ../template/default/config.html:136 ../template/default/help_config.html:60 -msgid "Path to recordings:" -msgstr "Chemin des Enregistrements VDR :" - -#: ../template/default/config.html:142 ../template/default/help_config.html:62 -msgid "Path to configuration files:" -msgstr "Chemin vers les fichiers de configuration :" - -#: ../template/default/config.html:148 ../template/default/help_config.html:64 -msgid "Path to EPG images:" -msgstr "Chemin vers les images EPG :" - -#: ../template/default/config.html:162 ../template/default/help_config.html:38 -#: ../template/default/help_config.html:70 -msgid "Identification" -msgstr "Identification" - -#: ../template/default/config.html:172 ../template/default/help_config.html:72 -msgid "Username:" -msgstr "Identifiant :" - -#: ../template/default/config.html:178 ../template/default/help_config.html:74 -msgid "Password:" -msgstr "Mot de Passe :" - -#: ../template/default/config.html:184 ../template/default/help_config.html:76 -msgid "Guest Account:" -msgstr "Compte d'Invité :" - -#: ../template/default/config.html:193 ../template/default/help_config.html:78 -msgid "Guest Username:" -msgstr "Identifiant Invité :" - -#: ../template/default/config.html:199 ../template/default/help_config.html:80 -msgid "Guest Password:" -msgstr "Mot de Passe Invité :" - -#: ../template/default/config.html:213 ../template/default/help_config.html:38 -#: ../template/default/help_config.html:86 -#: ../template/default/navigation.html:38 ../vdradmind.pl:4526 -msgid "Timeline" -msgstr "Chronologie" - -#: ../template/default/config.html:223 ../template/default/help_config.html:88 -msgid "Hours:" -msgstr "Heures :" - -#: ../template/default/config.html:229 ../template/default/help_config.html:90 -msgid "Times:" -msgstr "Périodes :" - -#: ../template/default/config.html:235 ../template/default/config.html:344 -#: ../template/default/help_config.html:92 -#: ../template/default/help_config.html:120 -msgid "Tooltips:" -msgstr "Bulles d'aide :" - -#: ../template/default/config.html:264 -#: ../template/default/help_config.html:100 -msgid "Active:" -msgstr "Active :" - -#: ../template/default/config.html:273 -#: ../template/default/help_config.html:102 -msgid "Timeout:" -msgstr "Délai de dépassement :" - -#: ../template/default/config.html:292 ../template/default/config.html:383 -#: ../template/default/help_config.html:132 -msgid "Time Margin at Start:" -msgstr "Marge avant :" - -#: ../template/default/config.html:298 ../template/default/config.html:389 -#: ../template/default/help_config.html:134 -msgid "Time Margin at Stop:" -msgstr "Marge après :" - -#: ../template/default/config.html:305 -#: ../template/default/help_config.html:108 -msgid "Send email after programming timer:" -msgstr "Envoyer email après création programmation :" - -#: ../template/default/config.html:314 -#: ../template/default/help_config.html:110 -msgid "Send email as:" -msgstr "Envoyer mail en tant que :" - -#: ../template/default/config.html:320 -#: ../template/default/help_config.html:112 -msgid "Send email to:" -msgstr "Envoyer mail à :" - -#: ../template/default/config.html:326 -#: ../template/default/help_config.html:114 -msgid "Mail server:" -msgstr "Serveur smtp :" - -#: ../template/default/config.html:332 -#: ../template/default/help_config.html:116 -msgid "SMTPAuth user:" -msgstr "Identifiant smtp :" - -#: ../template/default/config.html:338 -#: ../template/default/help_config.html:118 -msgid "SMTPAuth password:" -msgstr "Mot de Passe smtp :" - -#: ../template/default/config.html:361 ../template/default/timer_list.html:6 -#: ../template/default/timer_list.html:44 -#: ../template/default/help_config.html:38 -#: ../template/default/help_config.html:126 -#: ../template/default/help_timer_list.html:6 -#: ../template/default/help_timer_list.html:22 -#: ../template/default/navigation.html:46 -msgid "Timer" -msgstr "Programmation" - -#: ../template/default/config.html:395 -#: ../template/default/help_config.html:136 -msgid "Tooltips in timeline:" -msgstr "Bulles d'aide dans la chronologie :" - -#: ../template/default/config.html:404 -#: ../template/default/help_config.html:138 -msgid "Tooltips in list:" -msgstr "Bulles d'aide dans la liste :" - -#: ../template/default/config.html:413 -#: ../template/default/help_config.html:140 -msgid "Add summary to new timers:" -msgstr "Ajouter résumé dans les nouvelles programmations :" - -#: ../template/default/config.html:431 ../template/default/help_config.html:38 -#: ../template/default/help_config.html:146 -msgid "Streaming" -msgstr "Emission de Flux" - -#: ../template/default/config.html:441 -#: ../template/default/help_config.html:148 -msgid "Live Streaming:" -msgstr "Emission de Flux en direct :" - -#: ../template/default/config.html:450 -#: ../template/default/help_config.html:150 -msgid "HTTP Port of Streamdev (also possible 3000/ts):" -msgstr "Port HTTP Streamdev (aussi possible 3000/ts) :" - -#: ../template/default/config.html:456 -#: ../template/default/help_config.html:152 -msgid "Recordings Streaming:" -msgstr "Emission d'Enregistrements" - -#: ../template/default/config.html:465 -#: ../template/default/help_config.html:154 -msgid "Path to VDR Recordings on your workstation:" -msgstr "Chemin vers les Enregistrements VDR sur votre poste de travail :" - -#: ../template/default/config.html:471 -#: ../template/default/help_config.html:156 -msgid "MIME type for live streaming:" -msgstr "Type MIME pour l'Emission de flux en direct :" - -#: ../template/default/config.html:477 -#: ../template/default/help_config.html:158 -msgid "Suffix for live streaming:" -msgstr "Suffixe pour les flux en direct :" - -#: ../template/default/config.html:483 -#: ../template/default/help_config.html:160 -msgid "MIME type for recordings streaming:" -msgstr "Type MIME pour l'Emission d'Enregistrements :" - -#: ../template/default/config.html:489 -#: ../template/default/help_config.html:162 -msgid "Suffix for recordings streaming:" -msgstr "Suffixe pour les flux d'Enregistrements :" - -#: ../template/default/config.html:496 -msgid "Bandwidth of Streams:" -msgstr "Bande Passante Flux :" - -#: ../template/default/config.html:518 ../template/default/help_config.html:38 -#: ../template/default/help_config.html:168 -msgid "Expert" -msgstr "Expert" - -#: ../template/default/config.html:528 -#: ../template/default/help_config.html:171 -msgid "Read EPG directly using epg.data:" -msgstr "Lire l'EPG en utilisant directement epg.data :" - -#: ../template/default/config.html:537 -#: ../template/default/help_config.html:173 -msgid "epg.data filename:" -msgstr "Nom du fichier epg.data :" - -#: ../template/default/config.html:543 -#: ../template/default/help_config.html:175 -msgid "VFAT:" -msgstr "VFAT :" - -#: ../template/default/config.html:564 ../template/default/help_config.html:38 -#: ../template/default/help_config.html:181 -msgid "Channel Selections" -msgstr "Sélections Chaînes" - -#: ../template/default/config.html:574 -msgid "In \"Timeline\"?" -msgstr "Dans \"Chronologie\" ?" - -#: ../template/default/config.html:583 -msgid "In \"Channels\"?" -msgstr "In \"Channels\"?" - -#: ../template/default/config.html:592 -msgid "In \"Playing Today\"?" -msgstr "Dans \"Joué Aujourd'hui\" ?" - -#: ../template/default/config.html:601 -msgid "In \"What's On Now\"?" -msgstr "Dans \"En ce Moment\" ?" - -#: ../template/default/config.html:610 -msgid "In \"AutoTimer\"?" -msgstr "Dans \"Auto-Programmations\" ?" - -#: ../template/default/config.html:619 -msgid "In \"Watch TV\"?" -msgstr "Dans \"Regarder TV\" ?" - -#: ../template/default/config.html:660 -msgid "Apply" -msgstr "Appliquer" - -#: ../template/default/timer_list.html:27 -#: ../template/default/prog_timeline.html:82 -msgid "Duration:" -msgstr "Durée :" - -#: ../template/default/timer_list.html:27 -#: ../template/default/prog_timeline.html:82 -msgid "min" -msgstr "min" - -#: ../template/default/timer_list.html:27 -msgid "Transponder:" -msgstr "Transpondeur :" - -#: ../template/default/timer_list.html:27 -msgid "CA-System:" -msgstr "Système CA :" - -#: ../template/default/timer_list.html:46 -msgid "New Timer" -msgstr "Nouvelle Programmation" - -#: ../template/default/timer_list.html:244 -#: ../template/default/rec_list.html:59 -msgid "Date" -msgstr "Date" - -#: ../template/default/timer_list.html:308 -#: ../template/default/timer_list.html:382 -#: ../template/default/timer_list.html:383 -msgid "Edit timer status?" -msgstr "Changer Statut Programmation ?" - -#: ../template/default/timer_list.html:310 -msgid "This timer is inactive!" -msgstr "Cette Programmation est inactive !" - -#: ../template/default/timer_list.html:313 -msgid "This timer is impossible!" -msgstr "Cette Programmation est impossible !" - -#: ../template/default/timer_list.html:316 -msgid "No more timers on other transponders possible!" -msgstr "Pas plus de Programmations possibles sur d'autres transpondeurs !" - -#: ../template/default/timer_list.html:319 -msgid "Timer OK." -msgstr "Programmation OK." - -#: ../template/default/timer_list.html:326 -msgid "VPS" -msgstr "VPS" - -#: ../template/default/timer_list.html:327 -msgid "Auto" -msgstr "Auto" - -#: ../template/default/timer_list.html:382 -msgid "activate" -msgstr "activer" - -#: ../template/default/timer_list.html:383 -msgid "inactivate" -msgstr "désactiver" - -#: ../template/default/timer_list.html:384 -msgid "selected timers" -msgstr "programmations sélectionnées" - -#: ../template/default/timer_list.html:387 -msgid "Delete Selected Timers" -msgstr "Supprimer Programmations Sélectionnées" - -#: ../template/default/prog_list.html:6 ../template/default/navigation.html:42 -#: ../vdradmind.pl:4527 -msgid "Channels" -msgstr "Chaînes" - -#: ../template/default/prog_list.html:33 -msgid "Go!" -msgstr "Ok !" - -#: ../template/default/error.html:6 -msgid "Error!" -msgstr "Erreur !" - -#: ../template/default/tv.html:5 -msgid "TV" -msgstr "TV" - -#: ../template/default/tv.html:190 -msgid "Interval:" -msgstr "Intervalle :" - -#: ../template/default/tv.html:193 ../template/default/tv.html:194 -#: ../template/default/tv.html:195 ../template/default/tv.html:196 -#: ../template/default/tv.html:197 ../template/default/tv.html:198 -#: ../template/default/tv.html:199 -msgid "sec." -msgstr "sec." - -#: ../template/default/tv.html:201 ../template/default/tv.html:208 -msgid "G" -msgstr "R" - -#: ../template/default/tv.html:201 ../template/default/tv.html:208 -msgid "Grab the picture!" -msgstr "Rafraîchir!" - -#: ../template/default/tv.html:202 -msgid "Size:" -msgstr "Taille :" - -#: ../template/default/tv.html:210 -msgid "Open in separate window" -msgstr "Ouvrir dans une nouvelle fenêtre" - -#: ../template/default/prog_detail.html:43 -msgid "close" -msgstr "fermer" - -#: ../template/default/prog_detail.html:45 -msgid "view" -msgstr "vue" - -#: ../template/default/prog_detail.html:47 -msgid "record" -msgstr "enregistrer" - -#: ../template/default/prog_detail.html:49 -msgid "search" -msgstr "rechercher" - -#: ../template/default/prog_detail.html:52 -msgid "Lookup movie in the Internet-Movie-Database (IMDb)" -msgstr "Plus de details sur Internet" - -#: ../template/default/rec_list.html:6 ../template/default/rec_list.html:18 -#: ../template/default/help_rec_list.html:6 -#: ../template/default/help_rec_list.html:18 -#: ../template/default/navigation.html:54 ../vdradmind.pl:4529 -msgid "Recordings" -msgstr "Enregistrements" - -#: ../template/default/rec_list.html:21 -msgid "Total:" -msgstr "Total :" - -#: ../template/default/rec_list.html:21 ../template/default/rec_list.html:22 -msgid "h" -msgstr "h" - -#: ../template/default/rec_list.html:22 -msgid "Free:" -msgstr "Libre :" - -#: ../template/default/rec_list.html:112 -msgid "Total" -msgstr "Total" - -#: ../template/default/rec_list.html:118 ../template/default/rec_list.html:121 -msgid "New" -msgstr "Nouveau" - -#: ../template/default/rec_list.html:135 ../template/default/rec_edit.html:69 -msgid "Rename" -msgstr "Renommer" - -#: ../template/default/rec_list.html:140 -msgid "Delete recording?" -msgstr "Supprimer l'Enregistrement ?" - -#: ../template/default/rec_list.html:170 -msgid "Refresh" -msgstr "Rafraîchir" - -#: ../template/default/rec_list.html:174 -msgid "Commands:" -msgstr "Commandes :" - -#: ../template/default/rec_list.html:180 ../template/default/vdr_cmds.html:59 -#: ../template/default/vdr_cmds.html:73 -msgid "Run" -msgstr "Exécuter" - -#: ../template/default/rec_list.html:180 ../template/default/vdr_cmds.html:59 -#: ../template/default/vdr_cmds.html:73 -msgid "Really run this command?" -msgstr "Voulez-vous réellement exécuter cette commande ?" - -#: ../template/default/rec_list.html:184 -msgid "Delete Selected Recordings" -msgstr "Supprimer Enregistrements Sélectionnés" - -#: ../template/default/rec_list.html:184 -msgid "Delete all selected recordings?" -msgstr "Supprimer Enregistrements Sélectionnés ?" - -#: ../template/default/help_config.html:36 -msgid "" -"<p>Here you can change general settings and base settings for timers, " -"AutoTimers, channel selection and streaming parameters.</p>" -msgstr "" -"<p>Vous pouvez changer ici les réglages généraux et de base pour les " -"programmations, les Auto-Programmations, la sélection des chaines et les " -"paramétrages de diffusion.</p>" - -#: ../template/default/help_config.html:43 -msgid "The skin you want to use." -msgstr "Le thème que vous désirez utiliser." - -#: ../template/default/help_config.html:45 -msgid "The page you want to see at first connect to VDRAdmin-AM." -msgstr "La page que vous désirez voir à la première connection à VDRAdmin-AM." - -#: ../template/default/help_config.html:47 -msgid "" -"VDRAdmin-AM will load the given number of channels from VDR and present only " -"those in any fields where channels can be selected. This also limits the EPG " -"information VDRAdmin-AM will read so that you can use this to reduce " -"VDRAdmin-AM's memory consumption and increase its performance. <strong>0</" -"strong> turns this feature off and VDRAdmin-AM will use all available " -"channels." -msgstr "" -"VDRAdmin-AM va charger le présent nombre de chaînes de VDR et ne montrer que " -"celles qui ont les champs qui peuvent être sélectionnés. Cela limite aussi " -"les Informations EPG. VDRAdmin-AM ne va lire que ce dont il a besoin, ce qui " -"va réduire la consommation mémoire et augmenter la performance. <strong>0</" -"strong> désactive cette optionf and VDRAdmin-AM va utiliser toutes les " -"chaines." - -#: ../template/default/help_config.html:49 -msgid "" -"Here you can specify an IP address or range that can login without providing " -"login information. For example: \"192.168.0.0/24\" will include any IP " -"starting with \"192.168.0\", \"192.168.0.123/32\" will only match " -"\"192.168.0.123\"." -msgstr "" -"Vous pouvez spécifier ici une adresse IP ou une plage pour laquelle aucune " -"autentification ne sera demandée. Par exemple : \"192.168.0.0/24\" inclura " -"toute adresse commencant par \"192.168.0\", \"192.168.0.123/32\" inclura " -"seulement \"192.168.0.123\"." - -#: ../template/default/help_config.html:51 -msgid "Here you can set the localization VDRAdmin-AM should use." -msgstr "Ici vous pouvez définir la langue de VDRAdmin-AM." - -#: ../template/default/help_config.html:53 -#: ../template/default/help_config.html:67 -#: ../template/default/help_config.html:83 -#: ../template/default/help_config.html:95 -#: ../template/default/help_config.html:123 -#: ../template/default/help_config.html:143 -#: ../template/default/help_config.html:165 -#: ../template/default/help_config.html:178 -#: ../template/default/help_config.html:185 -msgid "Top" -msgstr "Haut" - -#: ../template/default/help_config.html:59 -msgid "" -"The number of DVB cards VDR can access. Depending on this value VDRAdmin-AM " -"will calculate critical timers in the <span class=\"ref_menu\">Timer</span> " -"menu." -msgstr "" -"Le nombre de carte DVB auxquelles VDR peut accéder. Suivant cette valeur " -"VDRAdmin-AM calculera les programmations critiques an le menu <span class=" -"\"ref_menu\">Programmation</span>." - -#: ../template/default/help_config.html:61 -msgid "" -"The path to VDR's recordings. It's used so that VDRAdmin-AM can locate the " -"recordings when using <span class=\"ref_label\">Recordings Streaming</span> " -"and <span class=\"ref_file\">reccmds.conf</span> in the <span class=" -"\"ref_menu\">Recordings</span> menu." -msgstr "" -"Le Chemin vers les enregistrements de VDR. Ceci est utilisé pour que VDR " -"puissse situer les enregistrements lorsque l'on utilise <span class=" -"\"ref_label\">Emission d'Enregistrements</span> et <span class=\"ref_file" -"\">reccmds.conf</span> dans le menu <span class=\"ref_menu" -"\">Enregistrements</span>." - -#: ../template/default/help_config.html:63 -msgid "" -"The path where VDR's configuration files are located. If this directory " -"contains the file <span class=\"ref_file\">reccmds.conf</span> its content " -"is shown in a selectbox in the <span class=\"ref_menu\">Recordings</span> " -"menu." -msgstr "" -"Le chemin où la configuration de VDR se situe. Si ce répertoire contient le " -"fichier <span class=\"ref_file\">reccmds.conf</span> son contenu est affiché " -"dans une boite de sélection dans le menu <span class=\"ref_menu" -"\">Enregistrements</span>." - -#: ../template/default/help_config.html:65 -msgid "The path where the EPG images are stored." -msgstr "Le chemin dans lequel les images EPG sont stockées." - -#: ../template/default/help_config.html:73 -msgid "" -"The username for the main user, i.e. the user having the most privileges." -msgstr "" -"Le nom d l'utilisateur principal, celui possédant le plus de privilèges." - -#: ../template/default/help_config.html:75 -msgid "The main user's password." -msgstr "Le mot de passe de l'utilisateur principal." - -#: ../template/default/help_config.html:77 -msgid "" -"If you want an user account having only limited privileges, this is for you. " -"The guest user cannot modify anything, it's only allowed to view the EPG, " -"timers, AutoTimers and recordings listings." -msgstr "" -"Si vous voulez un compte utilisateur possedant seulement des droits limités, " -"cei est pour vous. L'utilisateur invité ne peut rien modifier. Il est " -"seulement autoriser à voir le guides électronique des programmes, les " -"programmations, les Auto-Programmations et la liste des enregistrements." - -#: ../template/default/help_config.html:79 -msgid "The username for the guest user." -msgstr "Le nom de l'utilisateur invité." - -#: ../template/default/help_config.html:81 -msgid "The guest user's password." -msgstr "Le mot de passe de l'invité." - -#: ../template/default/help_config.html:89 -msgid "The number of hours to show in the timeline." -msgstr "Le nombre d'heures à afficher dans la chronologie." - -#: ../template/default/help_config.html:91 -msgid "" -"A comma separated list of times in <strong>hh:mm</strong> format that appear " -"in the selectbox placed at the top." -msgstr "" -"Une liste d'horaires séparés par des virgules au format <strong>hh:mm</" -"strong> qui apparaissent dans la boites de sélection placée en haut." - -#: ../template/default/help_config.html:93 -#: ../template/default/help_config.html:121 -msgid "Here you can (de-)activate the tooltips." -msgstr "Ici vous (dés-)activer les bulles d'aide." - -#: ../template/default/help_config.html:101 -msgid "Activate or deactivate the AutoTimer function." -msgstr "Active ou désactive la fonction d'Auto-Programmation." - -#: ../template/default/help_config.html:103 -msgid "The interval, the the EPG data is checked for updating the AutoTimers." -msgstr "" -"L'interval durant lequel les données du guide éléctronique des programmes " -"sont vérifiées pour mettre à jour les Auto-Programmations." - -#: ../template/default/help_config.html:105 -#: ../template/default/help_config.html:129 -#: ../template/default/help_timer_new.html:62 -#: ../template/default/help_at_timer_new.html:53 -msgid "" -"An integer in the range <strong>0...99</strong>, defining the " -"<strong>priority</strong> of this timer and of recordings created by this " -"timer. <strong>0</strong> represents the lowest value, <strong>99</strong> " -"the highest. The priority is used to decide which timer shall be started in " -"case there are two or more timers with the exact same <strong>start</strong> " -"time. The first timer in the list with the highest priority will be used." -"<br /><br />This value is also stored with the recording and is later used " -"to decide which recording to remove from disk in order to free space for a " -"new recording. If the disk runs full and a new recording needs more space, " -"an existing recording with the lowest priority (and which has exceeded its " -"guaranteed <strong>lifetime</strong>) will be removed.<br /><br />If all " -"available DVB cards are currently occupied, a timer with a higher priority " -"will interrupt the timer with the lowest priority in order to start " -"recording." -msgstr "" -"Un entier dans l'interval <strong>0...99</strong>, définissant la " -"<strong>priorité</strong> de cette programmation et de l'enregitrement créé " -"par cette programmation. <strong>0</strong> représente la valeur la plus " -"faible, <strong>99</strong> la plus haute. La priorité est utilisée pour " -"décider quelle programmation devrait être démarrée dans le cas où deux ou " -"plus de programmation possèdent la même heure <strong>début</strong>. La " -"première programmation dans la liste avec la priorité la plus haute sera " -"utilisée.<br /><br />Cette valeur est aussi stockée avec l'enregistrement, " -"et est utilisée plus tard pour décider quel enregistrement doit être " -"supprimé du disque pour libérer de la place pour un nouvel enregistrement. " -"Si le disque est plein et qu'un nouvel enregistrement nécéssite plus de " -"place, un enregistrement avec la plus faible priorité (et dont <strong>durée " -"de vie</strong> ganrantie sera dépassée) sera enlevé.<br /><br />Si toutes " -"les cartes DVB disponibles sont actuellement occupés, une programmation avec " -"une priorité plus élevée interrompra la programmation avec la priorité la " -"plus faible pour démarrer l'enregistrement." - -#: ../template/default/help_config.html:107 -#: ../template/default/help_config.html:131 -#: ../template/default/help_timer_new.html:64 -#: ../template/default/help_at_timer_new.html:55 -msgid "" -"The <strong>guaranteed</strong> lifetime (in days) of a recording created by " -"this timer. <strong>0</strong> means that this recording may be " -"automatically deleted at any time by a new recording with higher priority. " -"<strong>99</strong> means that this recording will never be automatically " -"deleted. Any number in the range <strong>1...98</strong> means that this " -"recording may not be automatically deleted in favour of a new recording, " -"until the given number of days since the <strong>start</strong> time of the " -"recording has passed by." -msgstr "" -"La durée de vie <strong>guarantie</strong> (en jours) d'un enregistrement " -"créé pas cette programmation. <strong>0</strong> signifie que cet " -"enregistrement peut être automatiquement supprimé à n'importe quelle moment " -"par un enregistrement avec une priorité plus haute. <strong>99</strong> " -"signifie que cet enregistrement ne sera jamais automatiquement supprimé. " -"Tout nombre dans l'interval <strong>1...98</strong> signifie que cet " -"enregistrement ne peut être automatiquement supprimé en faveur d'un nouvel " -"enregistrement, jusqu'à ce que le nombre de jour donné depuis la date de " -"<strong>démarrage</strong> de l'enregistrement soit dépassé." - -#: ../template/default/help_config.html:109 -msgid "" -"VDRAdmin-AM will send an email whenever an event matches an AutoTimer and a " -"timer has been programmed if you enable this feature." -msgstr "" -"VDRAdmin-AM va envoyer un email à chaque fois qu'un évènement va " -"correspondre à une auto-programmation et qu'une programmation a été " -"programmée si vous activez cette option." - -#: ../template/default/help_config.html:111 -msgid "Here you set the sending domain of the generated email." -msgstr "" -"Ici vous allez définir le nom de domaine de provenance de l'email généré." - -#: ../template/default/help_config.html:113 -msgid "The email address the email is sent to." -msgstr "L'adresse email de destination." - -#: ../template/default/help_config.html:115 -msgid "The outgoing mail server." -msgstr "Le serveur smtp d'envoi des emails." - -#: ../template/default/help_config.html:117 -msgid "" -"If you need to authenticate yourself at the outgoing mail server, you have " -"to supply the username and the password below. Leaving this field empty will " -"disable SMTPAuth." -msgstr "" -"Si vous avez besoin de vous authentifier sur votre serveur smtp, vous devez " -"fournir vos identifiants ci-dessous. Laissez ces champs vide implique qu'il " -"n'y a pas d'authentification smtp." - -#: ../template/default/help_config.html:119 -msgid "The password for the SMTPAuth user." -msgstr "Le Mot de Passe pour le serveur SMTP." - -#: ../template/default/help_config.html:133 -msgid "" -"The number of minutes VDRAdmin-AM subtracts from the broadcasts start time " -"found in the EPG. This value is used for timers programmed by AutoTimer and " -"timers manually programmed when pressing \"Record\" in any EPG view." -msgstr "" -"Le nombre de minutes soustraites par VDRAdmin-AM au début de diffusion " -"trouvé dans le guide électronique des programmes. Cette valeur est utilisée " -"pour les programmations d'AutoTimer et les programmations manuelles définies " -"par une pression sur \"Enregistrement\" sur tout affichage d'un guide " -"électronique des programmes." - -#: ../template/default/help_config.html:135 -msgid "" -"The number of minutes VDRAdmin-AM adds to the broadcasts stop time found in " -"the EPG. This value is used for timers programmed by AutoTimer and timers " -"manually programmed when pressing \"Record\" in any EPG view." -msgstr "" -"Le nombre de minutes ajoutés par VDRAdmin-AM à la fin de diffusion trouvé " -"dans le guide électronique des programmes.The number of minutes VDRAdmin-AM " -"adds to the broadcasts stop time found in the EPG. Cette valeur est utilisée " -"pour les programmations d'AutoTimer et les programmations manuelles définies " -"par une pression sur \"Enregistrement\" sur tout affichage d'un guide " -"électronique des programmes." - -#: ../template/default/help_config.html:137 -msgid "Here you can (de-)activate the tooltips in the timeline." -msgstr "Ici vous pouvez (dés-)activer les bulles d'aide dans la chronologie." - -#: ../template/default/help_config.html:139 -msgid "Here you can (de-)activate the tooltips in the list." -msgstr "Ici vous pouvez (dés-)activer les bulles d'aide dans la liste." - -#: ../template/default/help_config.html:141 -msgid "" -"If you don't want VDRAdmin-AM to add the summary taken from EPG to new " -"timers you can switch it off here." -msgstr "" -"Si vous ne voulez pas que VDRAdmin-AM ajoute le résumé de l'EPG dans les " -"nouvelles programmations vous pouvez désactiver cette option." - -#: ../template/default/help_config.html:149 -msgid "" -"Enable or disable live streaming using the <a href=\"http://www.magoa.net/" -"linux/\">streamdev plugin</a>. You also have to set the correct <span class=" -"\"ref_label\">HTTP Port for Streamdev</span> below." -msgstr "" -"Active ou Désactive la diffusion en directe en utilisant <a href=\"http://" -"www.magoa.net/linux/\">le plugin streamdev</a>. Vous devez aussi définir le " -"réglage correct du <span class=\"ref_label\">Port HTTP pour Streamdev</span> " -"ci-dessous." - -#: ../template/default/help_config.html:151 -msgid "" -"Here you have to set the port number your VDR's streamdev server listens for " -"connections. Additionally you can also provide the stream type you like to " -"use." -msgstr "" -"Vous pouvez ici régler le numéro de port sur lequel le serveur streamdev de " -"VDR sera à l'écoute pour toute connection. Additionellement vous pouvez " -"aussi fournir le type de flux que vous désirez utiliser." - -#: ../template/default/help_config.html:153 -msgid "" -"Enable or disable streaming of recordings.<br />Well actually this is no " -"real \"streaming\", but you have to setup your workstation so that it can " -"access VDR's recordings. You can use for example Samba or NFS for this. " -"VDRAdmin-AM simply generates a playlist that contains all parts of the " -"recording and sends this to your browser. If your browser and media player " -"are configured correctly you will see the recording on your workstation's " -"display." -msgstr "" -"Active ou désactive la diffusion des enregistrements.<br />Actuellement ceci " -"n'est un réel \"streaming\", mais vous avez à parametrer votre station pour " -"quelle puisse accéder aux enregistrements de VDR. Vous pouvez utiliser par " -"exemple Samba or NFS pour cette tâche. VDRAdmin-AM générera simplement une " -"liste de lecture qui contiendra tous les enregistrements et l'enverra à " -"votre navigateur. Si votre navigateur et votre lecteur de media sont " -"configurés corectement, vous pourrez voir les enregistrements sur votre " -"station." - -#: ../template/default/help_config.html:155 -msgid "" -"This is the path where your workstation can access VDR's recordings. This " -"depends on your VDR and workstation setup, for example \"\\\\vdr\\videos\" " -"or \"V:\\\" (on Windows) or \"/mnt/videos\" (on Linux)." -msgstr "" -"Ceci est le chemin où votre station peut accéder au enregistrements de VDR. " -"Cela dépend des réglages de votre VDR et de votre station, par exemple \"\\" -"\\vdr\\videos\" ou \"V:\\\" (sur Windows) ou \"/mnt/videos\" (sur Linux)." - -#: ../template/default/help_config.html:157 -msgid "" -"The MIME type to send when using live streaming. Defaults to \"video/x-" -"mpegurl\"." -msgstr "" -"Le Type MIME envoyé quand vous envoyez du flux en direct. Par défaut, le " -"type MIME est \"video/x-mpegurl\"." - -#: ../template/default/help_config.html:159 -msgid "The suffix to use for live streaming. Defaults to \"m3u\"." -msgstr "" -"L'extension à utiliser pour l'émission de flux en direct. Par défaut, " -"l'extension est \"video/x-mpegurl\"." - -#: ../template/default/help_config.html:161 -msgid "" -"The MIME type to send when using recordings streaming. Defaults to \"video/x-" -"mpegurl\"." -msgstr "" -"Le type MIME à envoyer lors de l'envoi de flux d'enregistrements. Par défaut " -"\"video/x-mpegurl\"." - -#: ../template/default/help_config.html:163 -msgid "The suffix to use for recordings streaming. Defaults to \"m3u\"." -msgstr "" -"L'extension à utiliser pour l'envoi de flux d'enregistrements. Par défaut " -"\"m3u\"." - -#: ../template/default/help_config.html:169 -msgid "" -"<p>This section is for experts <strong>only</strong>, i.e. you know what you " -"are doing!</p>" -msgstr "" -"<p>Cette section est pour les experts <strong>seulement</strong>. Vous devez " -"savoir ce que vous faites!</p>" - -#: ../template/default/help_config.html:172 -msgid "" -"Accessing VDR's EPG through VDR's SVDRPort seems to block VDR for some time. " -"If this option is activated VDRAdmin-AM will read the <span class=\"ref_file" -"\">epg.data</span> file directly so that VDR doesn't get blocked." -msgstr "" -"Accéder à l'EPG de VDR à travers SVDRP semble bloquer VDR pour quelque " -"temps. Si cette option est activée, VDRAdmin-AM lira le fichier <span class=" -"\"ref_file\">epg.data</span> directement, et donc VDR ne sera pas bloqué." - -#: ../template/default/help_config.html:174 -msgid "" -"If you've enabled the option above you need to tell VDRAdmin-AM where the " -"<span class=\"ref_file\">epg.data</span> file is located." -msgstr "" -"Si vous activez cette option ci-dessus, vous avez besoin de dire à VDRAdmin-" -"AM où est situé le fichier <span class=\"ref_file\">epg.data</span>." - -#: ../template/default/help_config.html:176 -msgid "" -"If you have compiled VDR with the VFAT define you have to enable this " -"option. If this option is set to the wrong value, you may have problems with " -"certain recordings if you want to stream them or run reccmds on them." -msgstr "" -"Si vous avez compilé VDR avec l'option VFAT, vous devez activer cette " -"option. Si cette option est paramétrée à une mauvaise valeur, vous pouvez " -"avoir des problèmes avec certains enregistrements si vous voulez les envoyer " -"en flux ou lancer des runcmds sur ceux-xi." - -#: ../template/default/help_config.html:182 -msgid "" -"<p>If you want to limit the number of channels used in some parts of " -"VDRAdmin-AM, this is for you!</p><p>Use the radio buttons to activate or " -"deactivate the wanted channels in the named menu.</p><p>To add channels to " -"the list of wanted channels you have to select them in the left side " -"selectbox and click <input type=\"submit\" class=\"submit\" value=\">>" -">>>\"/>. If you want to remove channels from the list of wanted " -"channels you have to select them in the right side selectbox and click " -"<input type=\"submit\" class=\"submit\" value=\"<<<<<\"/>.</p>" -msgstr "" -"<p>Si vous voulez limiter le nombre de chaînes utilisées dans certaines " -"parties de VDRAdmin-AM, cette option est faite pour vous !</p><p>Utilisez le " -"radio bouton pour activer ou désactiver les chaînes désirées le menu.</" -"p><p>Pour ajouter des chaînes dans la liste des chaînes désirées, vous devez " -"les sélectionner sur le côté gauche de la liste de sélection et cliquez sur " -"<input type=\"submit\" class=\"submit\" value=\">>>>>\"/>. Si " -"vous voulez enlever des chaînes de la liste des chaînes désirées, vous devez " -"les sélectionner dans la liste de sélection de droite et cliquez sur <input " -"type=\"submit\" class=\"submit\" value=\"<<<<<\"/>.</p>" - -#: ../template/default/prog_timeline.html:124 -msgid "Timeline:" -msgstr "Chronologie :" - -#: ../template/default/prog_timeline.html:124 -msgid "to" -msgstr "à" - -#: ../template/default/prog_list2.html:6 -#: ../template/default/navigation.html:34 ../vdradmind.pl:2604 -msgid "Playing Today" -msgstr "Joué Aujourd'hui" - -#: ../template/default/rec_edit.html:6 ../template/default/rec_edit.html:20 -msgid "Rename Recording" -msgstr "Nom Original d'Enregistrement :" - -#: ../template/default/rec_edit.html:39 -msgid "Original Name of Recording:" -msgstr "Nom Original d'Enregistrement :" - -#: ../template/default/rec_edit.html:45 -msgid "New Name of Recording:" -msgstr "Nouveau Nom d'Enregistrement :" - -#: ../template/default/rec_edit.html:51 -msgid "Subtitle:" -msgstr "Sous-titre :" - -#: ../template/default/help_timer_list.html:33 -msgid "" -"<p>Here you will find a listing of timers known to VDR.</p><p>On top you " -"will find a chart showing a day's timers graphically. This provides an quick " -"overview on what's going on at the specified day and helps you in finding " -"conflicting timers. Moving the mouse cursor above any timer box will display " -"a tooltip containing the timer's title, priority, lifetime and duration.</" -"p><p>Below the chart you'll find the timers list showing you some " -"information on the timers. You can change the list's sorting by clicking the " -"columns heading.</p><p>For each timer you have the following options:" -"<dl><dt>Set its state</dt><dd>By clicking on \"Yes\", \"No\", \"VPS\" or " -"\"Auto\" in the \"Active\" column.</dd><dt>Quickly view its priority and " -"lifetime</dt><dd>By pointing the mouse cursor to the timer's title.</" -"dd><dt>View its EPG entry</dt><dd>Timers that have set <span class=" -"\"ref_label\">AutoTimer Checking</span> to \"Transmission Identification\" " -"will show you the corresponding EPG entry if you click on the timer's title." -"</dd><dt>Edit the timer</dt><dd>You can edit a timer by clicking <img src=" -"\"bilder/edit.gif\" alt=\"edit\" />.</dd><dt>Delete the timer</dt><dd>To " -"delete a timer you click <img src=\"bilder/delete.gif\" alt=\"delete\" />.</" -"dd></dl></p><p>Each timer's state is indicated by differently coloured boxes " -"(in the chart view) or images (in the list view):<br /><span class=\"color_ok" -"\"> </span> / <img src=\"bilder/poempl_gruen.gif\" alt=\"on" -"\" align=\"middle\" /> Timer is OK and will record.<br /><span class=" -"\"color_collision\"> </span> / <img src=\"bilder/" -"poempl_gelb.gif\" alt=\"problem\" align=\"middle\" /> Timer conflicts with " -"other timers. That's not critical, as long as you have enough DVB cards for " -"the parallel recordings.<br /><span class=\"color_conflict\"> " -" </span> / <img src=\"bilder/poempl_rot.gif\" alt=\"impossible\" align=" -"\"middle\" /> Timer is critical and will most likely <strong>not</strong> " -"record.<br /><span class=\"color_inactive\"> </span> / <img " -"src=\"bilder/poempl_grau.gif\" alt=\"inactive\" align=\"middle\" /> Timer is " -"not active.</p><p>In addition to these functions you can add a new timer by " -"clicking <input type=\"submit\" class=\"submit\" value=\"New Timer\"/> at " -"the top and you can delete a number of timers at once by checking the box in " -"the last column of those timers and clicking <input type=\"submit\" class=" -"\"submit\" value=\"Delete Selected Timers\"/>.</p><p>You can <input type=" -"\"submit\" class=\"submit\" value=\"activate\"/> and <input type=\"submit\" " -"class=\"submit\" value=\"inactivate\"/> selected timers.</p>" -msgstr "" -"<p>Ici vous trouverez une liste des programmations connues par VDR.</p><p> " -"En haut vous trouverez un graphique montrant les programmations au jour le " -"jour. Cela permet d'apréhender rapidement ce qu'il se passe sur une journée " -"et vous aide à découvrir les programmations conflictuelles. Survoler avec la " -"souris une programmation permet d'afficher une bulle d'ailde contenant le " -"titre, la priorité, la durée de vie, la durée de celle-ci.</p><p> En dessous " -"du graph, vous trouverez une liste des programmations montrant quelques " -"informations sur les programmations. Vous pouvez chanfer l'ordre d'affichage " -"en cliquant sur les descriptions des colonnes.</p><p> Pour chaque " -"enregistrement, vous avez les options suivantes : <dl><dt> Changer son état " -"</dt><dd> En cliquant sur \"Oui\", \"Non\", \"VPS\" or \"Auto\" dans la " -"colonne \"Activé\" .</dd><dt> Voir rapidement sa priorité et sa durée de " -"vie</dt><dd> En survolant de la souris le titre de la programmation.</" -"dd><dt> Voir ses données EPG </dt><dd> Les programmations qui ont le " -"paramètre <span class=\"ref_label\"> Vérification de l'auto-programmation</" -"span> à \"Identification de Transmission\" montreront les données EPG si " -"vous cliquez sur le titre de la programmation.</dd><dt> Editer la " -"programmation</dt><dd>Vous pouvez éditer la programmation en cliquant sur " -"<img src=\"bilder/edit.gif\" alt=\"éditer\" />.</dd><dt> Supprimer une " -"programmation </dt><dd> Pour supprimer une programmation vous devez cliquer " -"sur <img src=\"bilder/delete.gif\" alt=\"supprimer\" />.</dd></dl></p><p> " -"Les états de programmation sont indiqués par des cases de couleurs " -"différentes (dans le vue avec graphique) ou des images (dans la vue par " -"liste) : <br /><span class=\"color_ok\"> </span> / <img src=" -"\"bilder/poempl_gruen.gif\" alt=\"on\" align=\"middle\" /> La programmation " -"est OK et enregistrera.<br /><span class=\"color_collision\"> " -" </span> / <img src=\"bilder/poempl_gelb.gif\" alt=\"problem\" align=" -"\"middle\" /> La programmation est conflictuelle avec une autre " -"programmation. Cela n'est pas critique, tant que vous avez assez de cartes " -"DVB que d'enregistrements.<br /><span class=\"color_conflict\"> " -" </span> / <img src=\"bilder/poempl_rot.gif\" alt=\"impossible\" align=" -"\"middle\" /> La programmation est critique et a beaucoup de chances de ne " -"<strong>pas</strong> enregistrer.<br /><span class=\"color_inactive\"> " -" </span> / <img src=\"bilder/poempl_grau.gif\" alt=\"inactive\" " -"align=\"middle\" /> La programmation n'est pas active.</p><p> En plus de ces " -"fonctions vous pouvez ajouter une nouvelle programmation en cliquant sur " -"<input type=\"submit\" class=\"submit\" value=\"Nouvelle Programmation\"/> " -"en haut et vous pouvez supprimer plusieurs programmations en cochant " -"plusieurs programmations dans la dernière coloone de ces programmations et " -"en cliquant sur <input type=\"submit\" class=\"submit\" value=\"Supprimer " -"les Programmations Sélectionnées\"/>.</p><p> Vous pouvez <input type=\"submit" -"\" class=\"submit\" value=\"activater\"/> et <input type=\"submit\" class=" -"\"submit\" value=\"désactiver\"/> les programmations sélectionnées.</p>" - -#: ../template/default/help_timer_new.html:32 -msgid "<p>Here you can edit a timer's settings.</p>" -msgstr "<p>Ici vous pouvez modifier un programmation.</p>" - -#: ../template/default/help_timer_new.html:35 -msgid "" -"Activate or deactivate this timer. Deactivated timers are still stored in " -"the timer list so that they can be activated again, but they do not record " -"anything meanwhile." -msgstr "" -"Active ou désactive une programmation. Les programmations désactivés sont " -"toujours stockées dans la liste des programmations et peuvent être activées " -"à nouveau, mais elles n'enregistrent néanmoins plus rien." - -#: ../template/default/help_timer_new.html:37 -msgid "" -"Depending on how this timer has been programmed you have up to three " -"possible settings:" -msgstr "" -"Suivant comment cette programmation à été définie,vous avez jusqu'à trois " -"possibilités :" - -#: ../template/default/help_timer_new.html:40 -msgid "" -"Monitor this timer using the identification provided in the EPG. Please note " -"that this only works if the provided identification is a fix and unique " -"value! This option is not available with timers programmed in VDR." -msgstr "" -"Surveille cette programmation en utilisant l'identification fournie par le " -"guide électronique des programmes. Notez que cela fonctionne seulement si " -"l'identification est fixe et unique! Cette option n'est pas disponible avec " -"les programmations créées dans VDR." - -#: ../template/default/help_timer_new.html:42 -msgid "Monitor this timer using the start and stop time." -msgstr "" -"Surveille cette programmation en utilisant l'horaire de démarrage et d'arrêt." - -#: ../template/default/help_timer_new.html:44 -msgid "Do not monitor this timer." -msgstr "Ne surveille pas cette programmation." - -#: ../template/default/help_timer_new.html:48 -msgid "The channel to record." -msgstr "La chaine à enregistrer." - -#: ../template/default/help_timer_new.html:50 -msgid "" -"The day when the timer should get active. You can enter the day in two " -"formats:<ul><li>Two digits (DD). This will use the current month and year.</" -"li><li>ISO norm (YYYY-MM-DD). Program your timers as far in the future as " -"you like.</li></ul>In case you want to program a repeating timer you can use " -"the seven checkboxes below the text field. Check the box for each day you " -"want the timer to get active." -msgstr "" -"Le jour où la programmation doit être active. Vous pouvez entrer le jour " -"selon 2 formats : <ul><li>2 chiffres (JJ). Cela utilisera le mois et l'année " -"courante.</li><li> ou la norme ISO (AAAA-MM-JJ). Vous pouvez programmer des " -"programmations aussi loin dans le futur que vous le désirez.</li></ul>Dans " -"le cas où vous voulez programmer une programmation répétitive, vous pouvez " -"utiliser les 7 cases à cocher en dessous du champ texte. Cochez les cases " -"des jours pour lesquels vous désirez que la programmation soit active." - -#: ../template/default/help_timer_new.html:58 -msgid "" -"This is the time when the timer should start recording. The first text field " -"is for \"hour\", the second for \"minute\"." -msgstr "" -"Ceci est l'heure de démarrage de la programmation. Le premier champ texte " -"est pour \"heure\", le second pour \"minute\"." - -#: ../template/default/help_timer_new.html:60 -msgid "" -"This is the time when the timer should stop recording. The first text field " -"is for \"hour\", the second for \"minute\"." -msgstr "" -"Ceci est l'heure de fin de la programmation. Le premier champ texte est pour " -"\"heure\", le second pour \"minute\"." - -#: ../template/default/help_timer_new.html:66 -msgid "" -"The <strong>file name</strong> this timer will give to a recording. If the " -"name shall contain subdirectories, these have to be delimited by '~' (since " -"the '/' character may be part of a regular programme name).<br /><br />The " -"special keywords <strong>TITLE</strong> and <strong>EPISODE</strong>, if " -"present, will be replaced by the title and episode information from the EPG " -"data at the time of recording (if that data is available). If at the time of " -"recording either of these cannot be determined, <strong>TITLE</strong> will " -"default to the channel name, and <strong>EPISODE</strong> will default to a " -"blank." -msgstr "" -"Le <strong>nom de fichier</strong> que cette programmation va donner à un " -"enregistrement. Si ce nom devait contenir des sous-répertoires, ceux-ci " -"devraient être délimités par '~' (le caractère '/' peut faire partie du nom " -"d'un programme).<br /><br /> Si les mots clé <strong> TITLE </strong> et/ou " -"<strong> EPISODE</strong> sont présents, ils seront remplacés par le titre " -"et l'information sur l'episode contenue dans les données EPG présentes au " -"moment du lancement de l'enregistrement (si ces données existent). Si au " -"moment de l'enregistrement ces variables ne peuvent être définies, <strong> " -"TITLE </strong> sera remplacé par le nom de la chaîne, et <strong> EPISODE </" -"strong> sera vide." - -#: ../template/default/help_timer_new.html:68 -msgid "" -"Arbitrary text that describes the recording made by this timer. If this " -"field is not empty, its contents will be written into the <span class=" -"\"ref_file\">summary.vdr</span> or <span class=\"ref_file\">info.vdr</span> " -"file of the recording." -msgstr "" -"Texte arbitraire qui décrit l'enregistrement fait par cette programmation. " -"Si ce champ n'est pas vide, son contenu sera écrit dans le fichier <span " -"class=\"ref_file\">summary.vdr</span> ou <span class=\"ref_file\">info.vdr</" -"span>, le fichier de l'enregistrement." - -#: ../template/default/help_at_timer_list.html:33 -msgid "" -"<p>Here you will find a listing of automatic timers (AutoTimer) known to " -"VDRAdmin-AM.</p><p>The list shows some information on AutoTimers. You can " -"change the list's sorting by clicking the columns heading.</p><p>For each " -"AutoTimer you have the following options:<dl><dt>Set its state</dt><dd>By " -"clicking on \"Yes\" or \"No\" in the \"Active\" column to toggle the " -"activity.</dd><dt>Quickly view its priority and lifetime</dt><dd>By pointing " -"the mouse cursor to the AutoTimer's title.</dd><dt>Edit the AutoTimer</" -"dt><dd>You can edit an AutoTimer by clicking <img src=\"bilder/edit.gif\" " -"alt=\"edit\" />.</dd><dt>Delete the AutoTimer</dt><dd>To delete an AutoTimer " -"you click <img src=\"bilder/delete.gif\" alt=\"delete\" />.</dd></dl></" -"p><p>Each AutoTimer's state is indicated by differently coloured images:<br /" -"><img src=\"bilder/poempl_gruen.gif\" alt=\"on\" align=\"middle\" /> " -"AutoTimer is OK and will automatically program matching broadcasts.<br /" -"><img src=\"bilder/poempl_grau.gif\" alt=\"inactive\" align=\"middle\" /> " -"AutoTimer is not active.</p><p>In addition to these functions you can add a " -"new AutoTimer by clicking <input type=\"submit\" class=\"submit\" value=" -"\"New AutoTimer\"/> at the top and you can delete a number of AutoTimers at " -"once by checking the box in the last column of those timers and clicking " -"<input type=\"submit\" class=\"submit\" value=\"Delete Selected AutoTimers\"/" -">.</p><p>Click <input type=\"submit\" class=\"submit\" value=\"Force Update" -"\"/> to force VDRAdmin-AM to reconnect to VDR, fetch the current EPG and " -"check for matching AutoTimers.</p>" -msgstr "" -"<p>Ici vous trouverez une liste des programmations automatiques (ou " -"AutoTimer) connues de VDRAdmin-AM.</p><p>Cette liste montre des informations " -"sur ces Programmations Automatiques. Vous pouvez changer l'ordre de cette " -"liste en cliquant les descriptions des colonnes.</p><p>Pour chaque " -"Programmation Automatique vous avez les options suivantes :<dl><dt> Changer " -"son état</dt><dd> En cliquant sur \"Oui\" ou \"Non\" dans la colonne \"Activé" -"\".</dd><dt> Voir rapidement sa priorité et sa durée de vie</dt><dd>En " -"survolant de la sourie le titre de la Programmation Automatique.</" -"dd><dt>Editer la Programmation Automatique</dt><dd> Vous pouvez éditer une " -"Programmation Automatique en cliquant sur<img src=\"bilder/edit.gif\" alt=" -"\"editer\" />.</dd><dt> Supprimer une Programmation Automatique </dt><dd> " -"Pour supprimer une Programmation Automatique vous devez cliquer sur <img src=" -"\"bilder/delete.gif\" alt=\"supprimer\" />.</dd></dl></p><p> Les étas de " -"toutes les Programmations Automatiques sont indiqués par des images de " -"couleurs différentes : <br /><img src=\"bilder/poempl_gruen.gif\" alt=\"on\" " -"align=\"middle\" /> La Programmation Automatique est OK and se programmera " -"automatiquement.<br /><img src=\"bilder/poempl_grau.gif\" alt=\"inactivée\" " -"align=\"middle\" /> La Programmation Automatique n'est pas activée.</p><p> " -"En plus de ces fontions vous pouvez ajouter une nouvelle Programmation " -"Automatique en cliquant sur <input type=\"submit\" class=\"submit\" value=" -"\"Nouvelle Programmation Automatique\"/> en haut et vous pouvez supprimer " -"plusieurs Programmations Automatiques en cochant les case dans la dernière " -"colonne de celles-ci et en cliquant sur <input type=\"submit\" class=\"submit" -"\" value=\"Supprimer les Programmations Automatiques Sélectionnées\"/>.</" -"p><p> Cliquez <input type=\"submit\" class=\"submit\" value=\"Forcer la Mise " -"à Jour\"/> pour forcer VDRAdmin-AM à se reconnecter à VDR, récupérer les " -"données EPG courantes et vérifier and les modèles de Programmations " -"Automatiques.</p>" - -#: ../template/default/help_at_timer_new.html:12 -#: ../template/default/help_at_timer_new.html:24 -#: ../template/default/at_timer_new.html:6 -#: ../template/default/at_timer_new.html:20 -msgid "Edit AutoTimer" -msgstr "Editer Auto-Programmation" - -#: ../template/default/help_at_timer_new.html:35 -msgid "" -"<p>Here you can edit an automatic timer's (AutoTimer) settings.</" -"p><p>AutoTimer is a key feature of VDRAdmin-AM. An AutoTimer consists of one " -"or more search terms and some other settings, that are looked for regularly " -"in the Electronic Program Guide (EPG). On match AutoTimer adds a timer in " -"VDR automatically for that broadcast. That's very comfortable for " -"irregularly broadcasted series or movies you don't want to miss.</p>" -msgstr "" -"<p>Ici vous pouvez édier les paramètres d'une programmation automatique " -"(AutoTimer). </p><p>Les Programmations Automatiques sont une fonction clé de " -"VDRAdmin-AM. Une Programmation Automatique consiste en un ou plusieurs " -"motifs et d'autres paramètres, qui sont recherchés dans l'Electronic Program " -"Guide (EPG). Quand ces motifs sont trouvés, une Programmation Automatique " -"est ajouté à VDR automatiquement pour cette diffusion. Cette fonctionnalité " -"est très confortable pour enregistrer des séries diffusées irrégulièrement " -"ou des films que vous ne voulez par manquer.</p>" - -#: ../template/default/help_at_timer_new.html:38 -#: ../template/default/at_timer_new.html:45 -msgid "AutoTimer Active:" -msgstr "Auto-Programmation Active :" - -#: ../template/default/help_at_timer_new.html:39 -msgid "" -"Activate or deactivate this AutoTimer. Deactivated AutoTimers are still " -"stored in the AutoTimer list so that they can be activated again, but they " -"do not record anything meanwhile. Above that you can set this to \"oneshot\" " -"so this AutoTimer only programs the (one!) next matching broadcast." -msgstr "" -"Activer ou désactiver cette Auto-Programmation. Les Auto-Programmations " -"désactivées sont toujours stockées dans la liste des Auto-programmation, " -"aussi elles peuvent être activées à tout moment, mais cependant elles " -"n'enregistre rien. Au dessus vous pouvez régler ceci à \"Une Fois\", donc " -"cette Auto-Programmation programme seulement la prochaine (et unique!) " -"occurence de la diffusion." - -#: ../template/default/help_at_timer_new.html:40 -#: ../template/default/at_timer_new.html:61 -msgid "Search Patterns:" -msgstr "Rechercher Modèles :" - -#: ../template/default/help_at_timer_new.html:41 -msgid "" -"Choosing the right search items decides whether only the wanted broadcasts " -"or broadcasts having similar names or even nothing gets recorded.<br />Case " -"doesn't matter, \"X-Files\" matches anything \"x-files\" will match. You can " -"set multiple search items by separating them with spaces. Only broadcasts " -"will match if they contain <strong>all</strong> items.<br />You'd better " -"only use letters and numbers for search items, as the EPG often miss colons, " -"brackets and other characters.<br />Experts can also use regular " -"expressions, but you have to get needed information from the VDRAdmin-AM " -"sources (undocumented feature).<br /><br />You can exclude broadcasts so " -"that they don't get recorded even if they would match an AutoTimer. " -"Therefore you have to enter that titles into the file <i>vdradmind.bl</i>, " -"one event a line. This file must be located in your VDRAdmin-AM's " -"configuration folder. If this string is found either in the EPG's <u>title</" -"u> or in <u>title~subtitle</u>, this event will not be programmed by " -"AutoTimer. So you can disable complete episodes (for example when using " -"\"Enterprise\" as Blacklist-string) or only one episode (when using " -"\"Enterprise~Azati Prime\" as Blacklist-string)." -msgstr "" -"Choisir les bons critères de recherches décidera soit que seules les " -"diffusions recherchés ou les diffusions ayant un nom similaires voire même " -"rien ne sera enregistré.<br />La Casse n'est pas importante, \"X-Files\" " -"concorde avec tout ce que \"x-files\" fera concorder. Vous pouvez régler de " -"multiples critères de recherche en les séparants par des espaces. Les " -"diffusions concorderont seulement sielles contiennent <strong>tous</strong> " -"les critères.<br />Utiliser de preférence uniquement des chiffres et des " -"lettres, car l'EPG ommet souvent les virgules, parentheses, et autres " -"caractères.<br />Les experts peuvent aussi utiliser les expressions " -"régulières, mais vous devrez étudier les sources de VDRAdmin-AM " -"(fonctionnalité non documentée).<br /><br />Vous pouvez exclure des " -"duffusions et donc elle ne seront pas enregistré même si elle concordent " -"avec une Auto-Programmation. Néanmoins vous devez entrer ses titres dans le " -"fichier <i>vdradmind.bl</i>, un evènement par ligne. Ce fichier doit être " -"situé dans votre répertoire de configuration de VDRAdmin-AM. Si cette chaine " -"de caractères est trouvé soit dans <u>titre</u> ou dans <u>titre~soustitre</" -"u>de l'EPG, cet évenement ne sera pas programmé. Donc sous pouvez désactivé " -"des épisodes complets (par exemple en utilisant \"Enterprise\" comme chaine " -"de caractère) ou seulement un épisode (en utilisant \"Enterprise~Azati Prime" -"\" comme chaine de caractères)." - -#: ../template/default/help_at_timer_new.html:42 -#: ../template/default/at_timer_new.html:69 -msgid "Search in:" -msgstr "Rechercher dans :" - -#: ../template/default/help_at_timer_new.html:43 -msgid "" -"Here you can define the EPG sections where VDRAdmin-AM should look for the " -"search pattern." -msgstr "" -"Ici, vous pouvez définir les sections du guide éléctronique des programmes " -"où VDRAdmin-AM recherchera le motif de recherche." - -#: ../template/default/help_at_timer_new.html:44 -#: ../template/default/at_timer_new.html:79 -msgid "Search only on these days:" -msgstr "Rechercher uniquement sur ces jours :" - -#: ../template/default/help_at_timer_new.html:45 -msgid "" -"Use these checkboxes to limit searching for matching broadcasts to a set of " -"weekdays." -msgstr "" -"Utilisez ces cases à cocher pour limiter la recherche de diffusions " -"concordantes à un jeu de jours." - -#: ../template/default/help_at_timer_new.html:47 -msgid "" -"The channel to look for matching broadcasts or \"all\" to search in all " -"known or wanted channels. You can define the wanted channels for AutoTimer " -"in \"Configuration\"." -msgstr "" -"La chaine à rechercher pour des diffusion concordantes ou \"toutes\" pour " -"rechercher dans toutes les chaines connues ou désirées. Vous pouvez définir " -"les chaines désirées pour l'Auto-programmation dans \"Configuration\"." - -#: ../template/default/help_at_timer_new.html:48 -#: ../template/default/at_timer_new.html:106 -msgid "Starts After:" -msgstr "Début de recherche :" - -#: ../template/default/help_at_timer_new.html:49 -msgid "" -"A broadcast must start after the time entered here to match. The first text " -"field is for \"hour\", the second for \"minute\"." -msgstr "" -"Une diffusion doit démarrer après l'horaire entrée pour être concordante. Le " -"premier champ est pour \"heure\", le second pour \"minute\"." - -#: ../template/default/help_at_timer_new.html:50 -#: ../template/default/at_timer_new.html:117 -msgid "Ends Before:" -msgstr "Fin de recherche :" - -#: ../template/default/help_at_timer_new.html:51 -msgid "" -"A broadcast must end before the time entered here to match. The first text " -"field is for \"hour\", the second for \"minute\"." -msgstr "" -"Une diffusion doit s'arrêter avant l'horaire entrée pour être concordante. " -"Le premier champ est pour \"heure\", le second pour \"minute\"." - -#: ../template/default/help_at_timer_new.html:56 -#: ../template/default/at_timer_new.html:144 -msgid "Episode:" -msgstr "Episode :" - -#: ../template/default/help_at_timer_new.html:57 -msgid "" -"Check this box if you want VDRAdmin-AM to append the broadcast's EPG " -"subtitle to the recording's file name." -msgstr "" -"Cochez cette case si vous voulez que VDRAdmin-AM ajoute le sous-titre EPG de " -"la diffusion au nom du fichier de l'enregistrement." - -#: ../template/default/help_at_timer_new.html:58 -#: ../template/default/at_timer_new.html:152 -msgid "Remember programmed timers:" -msgstr "Se souvenir des programmations :" - -#: ../template/default/help_at_timer_new.html:59 -msgid "" -"If you enable this VDRAdmin-AM will track timers it has already programmed " -"automatically. This is useful if want to deactivate or delete timers that " -"have been programmed automatically in the timers listing." -msgstr "" -"Si vous activez ceci, VDRAdmin-AM suivra les programmations qu'il aura " -"automatiquement créées. Ceci est utile si vous voulez désactiver ou " -"supprimer les programmations automatiquement créées dans la liste des " -"programmations." - -#: ../template/default/help_at_timer_new.html:60 -#: ../template/default/at_timer_new.html:161 -msgid "Directory:" -msgstr "Chemin :" - -#: ../template/default/help_at_timer_new.html:62 -msgid "" -"The directory this AutoTimer will place the recordings in. If the name shall " -"contain subdirectories, these have to be delimited by '~' (since the '/' " -"character may be part of a regular programme name).<br />VDRAdmin-AM will " -"append the matching broadcast's title and subtitle (if the \"Episode\" " -"checkbox is marked) to the directory given here.<br /><br />You can also use " -"the following keywords that are replaced in the final file name by the " -"values supplied by for example <a href=\"http://tvmovie2vdr.vdr-developer.org" -"\">tvm2vdr</a>:<ul><li>%Title% - will become the title of the event.</li><li>" -"%Subtitle% - will become the subtitle of the event.</li><li>%Director% - " -"will become the director of the event.</li><li>%Date% - will become the date " -"of the recording.</li><li>%Category% - will become the category of the event " -"(Spielfilm/Serie/...).</li><li>%Genre% - will become the genre of the event " -"(Drama/Krimi/..).</li><li>%Year% - will become the year of production.</" -"li><li>%Country% - will become the country of production.</li><li>%" -"Originaltitle% - will become the original title of the event.</li><li>%FSK% " -"- will become the FSK from the event.</li><li>%Episode% - will become the " -"episode's title of the event.</li><li>%Rating% - will become the rating of " -"the event from the EPG provider.</li></ul><h4>Note:</h4>If you use the above " -"keywords it's in your own responsibility to supply the <strong>complete file " -"name</strong> for the recordings! VDRAdmin-AM will not append anything to " -"the resulting string." -msgstr "" -"Le répertoire où cette Programmation Automatique va placer les " -"enregistrements. Si le nom devait contenir des sous répertoires, ceux-ci " -"devraient être délimités par le caractère '~' (le caractère '/' peut faire " -"partie du nom d'un executable).<br />VDRAdmin-AM ajoutera le titre et le " -"sous-titre (si la case \"Episode\" est cochée) du programme diffusé à ce nom." -"<br /><br />Vous pouvez aussi utiliser d'autres noms clé qui sont remplacés " -"par les valeurs fournies par exemple par <a href=\"http://tvmovie2vdr.vdr-" -"developer.org\">tvm2vdr</a>:<ul><li>%Title% - deviendra le titre de " -"l'évènement.</li><li>%Subtitle% - deviendra le sous-titre de l'évènement.</" -"li><li>%Director% - deviendra le metteur en scène de l'évènement.</li><li>%" -"Date% - deviendra la date de l'enregistrement.</li><li>%Category% - " -"deviendra la catégorie de l'évènement (Film/Série/...).</li><li>%Genre% - " -"deviendra le genre de l'évènement (Drame/Tragédie/..).</li><li>%Year% - " -"deviendra l'année de production.</li><li>%Country% - deviendra le pays de " -"production.</li><li>%Originaltitle% - deviendra le titre original de " -"l'évènement.</li><li>%FSK% - deviendra le FSK (??) de l'évènement.</li><li>%" -"Episode% - deviendra le titre de l'épisode de l'évènement.</li><li>%Rating% " -"- deviendra la note de l'évènement donnée par le fournisseur de l'EPG.</li></" -"ul><h4>Remarque : </h4>Si vous utilisez les noms clé ci-dessus, il est de " -"votre responsabilité de fournir le <strong>nom complet du fichier </strong> " -"de l'enregistrement ! VDRAdmin-AM n'ajoutera rien à la chaîne de caractères " -"obtenue." - -#: ../template/default/help_rec_list.html:29 -msgid "" -"<p>Here you will find a listing of recordings known to VDR. The headline " -"will also show you VDR's total and free disk space.</p><p>The listing " -"showing you some information on the recordings. You can change the list's " -"sorting by clicking the columns heading. Above the list you'll see the " -"navigation path. If you want to view the contents of previous folders you'll " -"have to click on its name in that path.</p><p>Each row contains this " -"information:<dl><dt>Date</dt><dd>The date when the recording has been done. " -"In case of folders this will show the number of recordings the folder " -"contains.</dd><dt>Time</dt><dd>The time when the recording has been done. In " -"case of folders this will show the number of <strong>new</strong> recordings " -"the folder contains.</dd><dt>Name</dt><dd>The recording's or folder's name. " -"Click it to show the recording's summary or descend into the folder.</" -"dd><dt>Rename (<img src=\"bilder/edit.gif\" alt=\"edit\" />)</dt><dd>Rename " -"a recording.<br /><h4>Note:</h4>This only works if VDR has the <u>RENR</u> " -"SVDRPort command which is no core VDR feature but is available through a " -"patch. <span class=\"ref_file\">vdr-aio21_svdrprename.patch</span> or <span " -"class=\"ref_file\">enAIO-v2.2+</span> provide this command.</dd><dt>Delete " -"(<img src=\"bilder/delete.gif\" alt=\"delete\" />)</dt><dd>Delete a " -"recording.</dd><dt>Stream (<img src=\"bilder/stream.gif\" alt=\"stream\" />)" -"</dt><dd>This column is only shown if you activated and configured <span " -"class=\"ref_label\">Recordings Streaming</span> in the <span class=\"ref_menu" -"\">Configuration</span> menu. You can watch the recording at your " -"workstation.</dd></dl></p><p>In addition to these functions you can delete a " -"number of recordings at once by checking the box in the last but one column " -"of those recordings and clicking <input type=\"submit\" class=\"submit\" " -"value=\"Delete Selected Recordings\"/>.</p><p>If you've set the path the " -"VDR's configuration files and have entries in VDR's <span class=\"ref_file" -"\">reccmds.conf</span> you can run those commands for the selected recording " -"by selecting the wanted command in the select box locate next to <span class=" -"\"ref_label\">Commands:</span> and pressing the <input type=\"submit\" class=" -"\"submit\" value=\"Run\"/> button.</p><p>Use <input type=\"submit\" class=" -"\"submit\" value=\"Refresh\"/> to force reloading of VDR's recordings " -"listing.</p>" -msgstr "" -"<p>Ici vous trouverez une liste des enregistrements connus de VDR. L'entête " -"montrera aussi les espaces disques utilisés en libres selon VDR.</p><p>La " -"liste vous montre certaines informations sur les enregistrements. Vous " -"pouvez changer l'ordre ce cette liste en cliquant sur la description de la " -"colonne. Au desssus de la liste vous verrez le chemin de navigation. Si vous " -"voulez voir le contenu des répertoires précédents vous devrez cliquant sur " -"leurs noms dans le chemin.</p><p> Chaque ligne contient ces informations : " -"<dl><dt>Date</dt><dd>La Date de création de l'enregistrement. Dans le cas " -"d'un répertoire, cela montrera le nombre d'enregistrements que ce répertoire " -"contient.</dd><dt>Heure</dt><dd>L'heure de création de l'enregistrement.Dans " -"le cas d'un répertoire, cela montrera le nombre de <strong>nouveaux</strong> " -"enregistrements que ce répertoire contient.</dd><dt>Nom</dt><dd>Le nom de " -"l'enregistrement ou du répertoire. Cliquez dessus pour voir le résumé de " -"l'enregistrement ou naviguer dans le répertoire.</dd><dt>Renommer (<img src=" -"\"bilder/edit.gif\" alt=\"editer\" />)</dt><dd>Renommer un enregistrement." -"<br /><h4> Remarque : </h4> Cele ne marque que si VDR a la commande SVDRPort " -"<u>RENR</u> qui ne fait pas partie de base de VDR feature mais qui peut être " -"ajouter grâce à un patch. <span class=\"ref_file\">vdr-aio21_svdrprename." -"patch</span> ou <span class=\"ref_file\">enAIO-v2.2+</span> permettent " -"d'ajouter cette commande.</dd><dt>Supprimer (<img src=\"bilder/delete.gif\" " -"alt=\"supprimer\" />)</dt><dd>Supprimer un enregistrement.</dd><dt>Emettre " -"un flux (<img src=\"bilder/stream.gif\" alt=\"stream\" />)</dt><dd>Cette " -"colonne n'est visible que si vous avez activé et configuré <span class=" -"\"ref_label\">L'emission de Flux d'Enregistrement</span> dans le menu de " -"<span class=\"ref_menu\">Configuration</span>. Vous pouvez regarder " -"l'enregistrement sur votre station de travail.</dd></dl></p><p>En plus de " -"ces fonctions vous pouvez supprimer plusieurs enregistrements en même temps " -"en cochant les cases de la dernière colonne de ceux-ci et en cliquant sur " -"<input type=\"submit\" class=\"submit\" value=\"Supprimer les " -"Enregistrements Sélectionnés\"/>.</p><p>Si vous avez défini le chemin des " -"fichiers de configuration de VDR et que vous avez des entrées dans le <span " -"class=\"ref_file\">reccmds.conf</span> de VDR vous pouvez éxecuter ces " -"commandes pour les enregistrements sélectionnées en sélectionnant la " -"commande désirée dans la liste de sélection située près de <span class=" -"\"ref_label\"> Commandes : </span> et en pressant sur le bouton <input type=" -"\"submit\" class=\"submit\" value=\"Exécuter\"/>.</p><p>Utilisez <input type=" -"\"submit\" class=\"submit\" value=\"Rafraîchir\"/> pour forcer VDR à " -"rafraîchir sa liste d'enregistrements.</p>" - -#: ../template/default/at_timer_new.html:6 -#: ../template/default/at_timer_new.html:20 -msgid "Add New AutoTimer" -msgstr "Ajouter Nouvelle Auto-Programmation" - -#: ../template/default/at_timer_new.html:50 -#: ../template/default/at_timer_new.html:54 -msgid "oneshot" -msgstr "une fois" - -#: ../template/default/at_timer_new.html:71 -#: ../template/default/at_timer_new.html:190 -msgid "Title" -msgstr "une fois" - -#: ../template/default/at_timer_new.html:72 -#: ../template/default/at_timer_new.html:191 -msgid "Subtitle" -msgstr "Sous-titre" - -#: ../template/default/at_timer_new.html:73 -msgid "Description" -msgstr "Description" - -#: ../template/default/at_timer_new.html:96 -msgid "all" -msgstr "tout" - -#: ../template/default/at_timer_new.html:177 -msgid "Test" -msgstr "Test" - -#: ../template/default/at_timer_new.html:192 -msgid "Broadcasted" -msgstr "Diffusé" - -#: ../template/default/at_timer_new.html:193 -msgid "Stored in" -msgstr "Stockés dans" - -#: ../template/default/at_timer_new.html:213 -msgid "No matches found!" -msgstr "Aucune correspondance trouvée !" - -#: ../template/default/navigation.html:62 -msgid "Watch TV" -msgstr "Regarder TV" - -#: ../template/default/navigation.html:66 ../template/default/vdr_cmds.html:6 -#: ../template/default/vdr_cmds.html:18 -msgid "VDR Commands" -msgstr "Commandes VDR" - -#: ../template/default/navigation.html:74 ../template/default/about.html:6 -msgid "About" -msgstr "A propos" - -#: ../template/default/navigation.html:80 -msgid "Search" -msgstr "Rechercher" - -#: ../template/default/about.html:18 -msgid "Authors" -msgstr "Auteurs" - -#: ../template/default/about.html:28 -msgid "Current author (VDRAdmin-AM branch):" -msgstr "Auteur Actuel (Branche VDRAdmin-AM) :" - -#: ../template/default/about.html:34 -msgid "Original author (VDRAdmin):" -msgstr "Auteur du programme (VDRAdmin) :" - -#: ../template/default/about.html:48 -msgid "Translation Team" -msgstr "Equipe de Traduction" - -#: ../template/default/about.html:58 -msgid "Dutch:" -msgstr "Hollandais :" - -#: ../template/default/about.html:64 -msgid "English:" -msgstr "Anglais :" - -#: ../template/default/about.html:70 -msgid "Finnish:" -msgstr "Finlandais :" - -#: ../template/default/about.html:76 -msgid "French:" -msgstr "Français" - -#: ../template/default/about.html:77 -msgid "At the moment unmaintained, former translations by:" -msgstr "Pour le moment non maintenu, précédente traductions par :" - -#: ../template/default/about.html:82 -msgid "German:" -msgstr "Allemand :" - -#: ../template/default/about.html:88 -msgid "Spanish:" -msgstr "Espagnol :" - -#: ../template/default/about.html:102 -msgid "Informations" -msgstr "Informations" - -#: ../template/default/about.html:112 -msgid "VDRAdmin-AM version:" -msgstr "Version de VDRAdmin-AM :" - -#: ../template/default/about.html:118 -msgid "VDR version:" -msgstr "Version de VDR :" - -#: ../template/default/about.html:132 -msgid "Getting Help and Reporting Bugs" -msgstr "Avoir de l'Aide et Rapporter les Bugs" - -#: ../template/default/about.html:144 -msgid "" -"If you need help please first try to use the online help you'll find on some " -"pages. You can access it by clicking <img src=\"bilder/help.gif\"/>." -msgstr "" -"Si vous avez besoin d'aide, merci de regarder en priorité sur l'aide en " -"ligne. Ici <img src=\"bilder/help.gif\"/>." - -#: ../template/default/about.html:145 -msgid "" -"If this doesn't provide the information you need you can try to get help at " -"<a href=\"http://www.vdrportal.de\" target=\"_blank\">VDR-Portal</a> if you " -"understand German language. Please use the announcement thread if possible, " -"search for:" -msgstr "" -"Si vous ne trouvez pas l'information recherchée, vous pouvez essayer " -"d'obtenir de l'aide sur <a href=\"http://www.vdrportal.de\" target=\"_blank" -"\">VDR-Portal</a> si vous comprenez l'allemand. Merci d'utiliser le topic de " -"l'annonce si possible, recherchez : " - -#: ../template/default/about.html:146 -msgid "" -"If you think you have found a bug please check that it's a new one and " -"report it in the <a href=\"http://www.vdr-developer.org/mantisbt/main_page." -"php\" target=\"_blank\">VDRAdmin-AM BugTracking system</a>." -msgstr "" -"Si vous croyez avoir trouvé un bug, merci de vérifier si c'est un bug non " -"identifié dans <a href=\"http://www.vdr-developer.org/mantisbt/main_page.php" -"\" target=\"_blank\">L'Outil de Gestion des Bugs VDRAdmin-AM</a>." - -#: ../template/default/vdr_cmds.html:43 -msgid "Number of lines to show:" -msgstr "Nombre de lignes à montrer :" - -#: ../template/default/vdr_cmds.html:49 -msgid "unlimited" -msgstr "illlimité" - -#: ../template/default/vdr_cmds.html:56 -msgid "SVDRP commands:" -msgstr "Commandes SVDRP :" - -#: ../template/default/vdr_cmds.html:66 -msgid "Commands defined in commands.conf:" -msgstr "Commandes définies dans commands.conf :" - -#: ../template/default/vdr_cmds.html:92 -msgid "Output" -msgstr "Sortie" - -#: ../vdradmind.pl:293 -msgid "What's your VDR hostname (e.g video.intra.net)?" -msgstr "Quel est votre Nom d'Hôte (ex video.intra.net) ?" - -#: ../vdradmind.pl:294 -msgid "On which port does VDR listen to SVDRP queries?" -msgstr "Sur quel port VDR écoute les requêtes SVDRP ?" - -#: ../vdradmind.pl:295 -msgid "On which address should VDRAdmin-AM listen (0.0.0.0 for any)?" -msgstr "Sur quelle adresse VDRAdmin-AM doit-il écouter (0.0.0.0 pour toutes) ?" - -#: ../vdradmind.pl:296 -msgid "On which port should VDRAdmin-AM listen?" -msgstr "Sur quel port VDRAdmin-AM doit-il écouter ?" - -#: ../vdradmind.pl:297 -msgid "Username?" -msgstr "Identifiant ?" - -#: ../vdradmind.pl:298 -msgid "Password?" -msgstr "Mot de Passe ?" - -#: ../vdradmind.pl:299 -msgid "Where are your recordings stored?" -msgstr "Où vos enregistrements sont-ils stockés ?" - -#: ../vdradmind.pl:300 -msgid "Where are your VDR's configuration files located?" -msgstr "Où sont vos fichiers de configuration de VDR ?" - -#: ../vdradmind.pl:306 -msgid "Config file written successfully." -msgstr "Fichier de configuration écrit avec succès." - -#: ../vdradmind.pl:358 -#, perl-format -msgid "vdradmind.pl %s started with pid %d." -msgstr "vdradmin.pl %s a démarré avec le pid %d." - -#: ../vdradmind.pl:412 ../vdradmind.pl:1004 ../vdradmind.pl:1919 -msgid "Not found" -msgstr "Non trouvé" - -#: ../vdradmind.pl:412 ../vdradmind.pl:1920 -msgid "The requested URL was not found on this server!" -msgstr "L'URL demandée n'a pas été trouvée sur le serveur !" - -#: ../vdradmind.pl:480 ../vdradmind.pl:1000 ../vdradmind.pl:1922 -msgid "Forbidden" -msgstr "Interdit" - -#: ../vdradmind.pl:480 ../vdradmind.pl:1923 -msgid "You don't have permission to access this function!" -msgstr "Vous n'avez pas la permission d'accéder à cette fonction !" - -#: ../vdradmind.pl:1000 ../vdradmind.pl:1924 -#, perl-format -msgid "Access to file \"%s\" denied!" -msgstr "Accès au fichier \"%s\" interdit !" - -#: ../vdradmind.pl:1004 ../vdradmind.pl:1921 -#, perl-format -msgid "The URL \"%s\" was not found on this server!" -msgstr "L'URL \"%s\" n'a pas été trouvée sur le serveur !" - -#: ../vdradmind.pl:1925 -#, perl-format -msgid "Can't open file \"%s\"!" -msgstr "Ne peut pas ouvrir le fichier \"%s\" !" - -#: ../vdradmind.pl:1926 -#, perl-format -msgid "Can't connect to VDR at %s!" -msgstr "Ne peut se connecter à %s !" - -#: ../vdradmind.pl:1927 -#, perl-format -msgid "Error while sending command to VDR at %s" -msgstr "Erreur en envoyant la commande à %s" - -#: ../vdradmind.pl:2604 -msgid "Playing Tomorrow" -msgstr "Joué demain" - -#: ../vdradmind.pl:2604 -#, perl-format -msgid "Playing on the %d." -msgstr "En cours sur la %d." - -#: ../vdradmind.pl:3947 -msgid "Suitable matches for:" -msgstr "Correspondances trouvées pour :" - -#: ../vdradmind.pl:4002 -msgid "Schedule" -msgstr "Programmateur" - -#: ../vdradmind.pl:4525 -msgid "Playing Today?" -msgstr "Aujourd'hui ?" - -#: ../vdradmind.pl:4528 -msgid "Timers" -msgstr "Programmations" - -#: ../vdradmind.pl:4591 -msgid "System default" -msgstr "Par défaut" @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: nl\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-04-28 12:15+0200\n" -"PO-Revision-Date: 2006-03-24 19:13+0100\n" +"POT-Creation-Date: 2006-05-11 16:09+0200\n" +"PO-Revision-Date: 2006-04-28 18:54+0200\n" "Last-Translator: Roel <rl.koelewijn@home.nl>\n" "Language-Team: Nederlands <nl@li.org>\n" "MIME-Version: 1.0\n" @@ -183,7 +183,7 @@ msgstr "Start tijd:" #: ../template/default/prog_timeline.html:108 #: ../template/default/prog_timeline.html:123 #: ../template/default/at_timer_new.html:111 -#: ../template/default/at_timer_new.html:122 ../vdradmind.pl:3981 +#: ../template/default/at_timer_new.html:122 ../vdradmind.pl:3977 msgid "o'clock" msgstr "Uur" @@ -368,7 +368,7 @@ msgstr "Verwijder alle geselecteerde timers?" #: ../template/default/prog_summary.html:7 #: ../template/default/prog_timeline.html:7 -#: ../template/default/navigation.html:30 ../vdradmind.pl:4558 +#: ../template/default/navigation.html:30 ../vdradmind.pl:4573 msgid "What's On Now?" msgstr "Wat is er nu op?" @@ -493,7 +493,7 @@ msgstr "Wachtwoord gast" #: ../template/default/config.html:213 ../template/default/help_config.html:38 #: ../template/default/help_config.html:86 -#: ../template/default/navigation.html:38 ../vdradmind.pl:4560 +#: ../template/default/navigation.html:38 ../vdradmind.pl:4573 msgid "Timeline" msgstr "Tijdlijn" @@ -762,7 +762,7 @@ msgid "Delete Selected Timers" msgstr "Verwijder geselecteerde timers" #: ../template/default/prog_list.html:6 ../template/default/navigation.html:42 -#: ../vdradmind.pl:4561 +#: ../vdradmind.pl:4573 msgid "Channels" msgstr "Kanalen" @@ -828,7 +828,7 @@ msgstr "Zoek de film op bij de Internet-Movie-Database (IMDb)" #: ../template/default/rec_list.html:6 ../template/default/rec_list.html:18 #: ../template/default/help_rec_list.html:6 #: ../template/default/help_rec_list.html:18 -#: ../template/default/navigation.html:54 ../vdradmind.pl:4563 +#: ../template/default/navigation.html:54 ../vdradmind.pl:4573 msgid "Recordings" msgstr "Opnames" @@ -1106,9 +1106,8 @@ msgstr "" "autotimer en een timer is geprogrammeerd als u dit aktiveerd in de toekomst." #: ../template/default/help_config.html:111 -#, fuzzy msgid "Here you set the sending email address of the generated email." -msgstr "Hier het domein instellen voor de aangemaakte email." +msgstr "Hier kunt u de afzender instellen van de aangemaakte email." #: ../template/default/help_config.html:113 msgid "The email address the email is sent to." @@ -1311,7 +1310,7 @@ msgid "to" msgstr "naar " #: ../template/default/prog_list2.html:6 -#: ../template/default/navigation.html:34 ../vdradmind.pl:2637 +#: ../template/default/navigation.html:34 ../vdradmind.pl:2676 msgid "Playing Today" msgstr "Programma vandaag " @@ -1970,23 +1969,27 @@ msgstr "Duits:" msgid "Spanish:" msgstr "Spaans:" -#: ../template/default/about.html:102 +#: ../template/default/about.html:94 +msgid "Russian:" +msgstr "" + +#: ../template/default/about.html:108 msgid "Informations" msgstr "Informatie" -#: ../template/default/about.html:112 +#: ../template/default/about.html:118 msgid "VDRAdmin-AM version:" msgstr "VDRAdmin-AM versie:" -#: ../template/default/about.html:118 +#: ../template/default/about.html:124 msgid "VDR version:" msgstr "VDRAdmin versie:" -#: ../template/default/about.html:132 +#: ../template/default/about.html:138 msgid "Getting Help and Reporting Bugs" msgstr "Voor het verkrijgen van hulp en melden van bugs" -#: ../template/default/about.html:144 +#: ../template/default/about.html:150 msgid "" "If you need help please first try to use the online help you'll find on some " "pages. You can access it by clicking <img src=\"bilder/help.gif\"/>." @@ -1995,7 +1998,7 @@ msgstr "" "pagina's vinden. U kunt dit bezoeken door op <img src=\"bilder/help.gif\"/> " "te klikken." -#: ../template/default/about.html:145 +#: ../template/default/about.html:151 msgid "" "If this doesn't provide the information you need you can try to get help at " "<a href=\"http://www.vdrportal.de\" target=\"_blank\">VDR-Portal</a> if you " @@ -2007,7 +2010,7 @@ msgstr "" "de duitse taal verstaat. Gebruik graag de bekendmakingen draad indien " "mogelijk, zoek naar:" -#: ../template/default/about.html:146 +#: ../template/default/about.html:152 msgid "" "If you think you have found a bug please check that it's a new one and " "report it in the <a href=\"http://www.vdr-developer.org/mantisbt/main_page." @@ -2037,118 +2040,117 @@ msgstr "Commando's gedefinieerd in commands.conf:" msgid "Output" msgstr "Uitvoer" -#: ../vdradmind.pl:296 +#: ../vdradmind.pl:312 msgid "What's your VDR hostname (e.g video.intra.net)?" msgstr "Wat de de hostnaam van de VDR (b.v. video.intra.net)?" -#: ../vdradmind.pl:297 +#: ../vdradmind.pl:313 msgid "On which port does VDR listen to SVDRP queries?" msgstr "Op welke poort luister VDR naar SVDRP verzoeken?" -#: ../vdradmind.pl:298 +#: ../vdradmind.pl:314 msgid "On which address should VDRAdmin-AM listen (0.0.0.0 for any)?" msgstr "Naar welk adres moet VDRAdmin-AM luisteren (0.0.0.0 voor alles)?" -#: ../vdradmind.pl:299 +#: ../vdradmind.pl:315 msgid "On which port should VDRAdmin-AM listen?" msgstr "Naar welke poort moet VDRAdmin-AM luisteren?" -#: ../vdradmind.pl:300 +#: ../vdradmind.pl:316 msgid "Username?" msgstr "Gebruikersnaam?" -#: ../vdradmind.pl:301 +#: ../vdradmind.pl:317 msgid "Password?" msgstr "Wachtwoord?" -#: ../vdradmind.pl:302 +#: ../vdradmind.pl:318 msgid "Where are your recordings stored?" msgstr "Waar worden uw opnames opgeslagen?" -#: ../vdradmind.pl:303 +#: ../vdradmind.pl:319 msgid "Where are your VDR's configuration files located?" msgstr "Waar bevinden zicht de VDR's configuratie bestanden?" -#: ../vdradmind.pl:309 +#: ../vdradmind.pl:326 msgid "Config file written successfully." msgstr "Configuratie bestanden succesvol weggeschreven." -#: ../vdradmind.pl:362 +#: ../vdradmind.pl:381 #, perl-format msgid "vdradmind.pl %s started with pid %d." msgstr "vdradmind.pl %s gestart met pid %d." -#: ../vdradmind.pl:418 ../vdradmind.pl:1015 ../vdradmind.pl:1947 +#: ../vdradmind.pl:440 ../vdradmind.pl:1038 ../vdradmind.pl:1998 msgid "Not found" msgstr "Niet gevonden" -#: ../vdradmind.pl:418 ../vdradmind.pl:1948 +#: ../vdradmind.pl:440 ../vdradmind.pl:1999 msgid "The requested URL was not found on this server!" msgstr "De gevraagde URl is niet gevonden op deze server!" -#: ../vdradmind.pl:487 ../vdradmind.pl:1011 ../vdradmind.pl:1950 +#: ../vdradmind.pl:510 ../vdradmind.pl:1034 ../vdradmind.pl:2001 msgid "Forbidden" msgstr "Verboden" -#: ../vdradmind.pl:487 ../vdradmind.pl:1951 +#: ../vdradmind.pl:510 ../vdradmind.pl:2002 msgid "You don't have permission to access this function!" msgstr "U heeft geen toestemming om deze functie te gebruiken!" -#: ../vdradmind.pl:1011 ../vdradmind.pl:1952 +#: ../vdradmind.pl:1034 ../vdradmind.pl:2003 #, perl-format msgid "Access to file \"%s\" denied!" msgstr "Toegang tot bestand \"%s\" geweigerd!" -#: ../vdradmind.pl:1015 ../vdradmind.pl:1949 +#: ../vdradmind.pl:1038 ../vdradmind.pl:2000 #, perl-format msgid "The URL \"%s\" was not found on this server!" msgstr "De URl \"%s\" is niet gevonden op deze server!" -#: ../vdradmind.pl:1953 +#: ../vdradmind.pl:2004 #, perl-format msgid "Can't open file \"%s\"!" msgstr "Kan bestand \"%s\" niet openen!" -#: ../vdradmind.pl:1954 +#: ../vdradmind.pl:2005 #, perl-format msgid "" "Can't connect to VDR at %s:%s<br /><br />Please check if VDR is running and " "if VDR's svdrphosts.conf is configured correctly." msgstr "" +"Kan geen verbinding maken met VDR at %s:%s<br /><br /> Controleer of VDR " +"draait en of VDR's svdrphosts.conf op de juiste manier is geconfigureerd." -#: ../vdradmind.pl:1955 +#: ../vdradmind.pl:2006 #, perl-format msgid "Error while sending command to VDR at %s" msgstr "Fout tijdens verzenden van commando op %s" -#: ../vdradmind.pl:2637 +#: ../vdradmind.pl:2676 msgid "Playing Tomorrow" msgstr "Speelt morgen" -#: ../vdradmind.pl:2637 +#: ../vdradmind.pl:2676 #, perl-format msgid "Playing on the %d." msgstr "Speelt op de %d." -#: ../vdradmind.pl:3981 +#: ../vdradmind.pl:3977 msgid "Suitable matches for:" msgstr "Bruikbare overeenkomsten voor:" -#: ../vdradmind.pl:4036 +#: ../vdradmind.pl:4034 msgid "Schedule" msgstr "Schema" -#: ../vdradmind.pl:4559 +#: ../vdradmind.pl:4573 msgid "Playing Today?" msgstr "Speelt vandaag?" -#: ../vdradmind.pl:4562 +#: ../vdradmind.pl:4573 msgid "Timers" msgstr "Timers" -#: ../vdradmind.pl:4625 +#: ../vdradmind.pl:4641 msgid "System default" msgstr "Systeem standaard" - -#~ msgid "Can't connect to VDR at %s!" -#~ msgstr "Kan niet met VDR verbinden op %s!" @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: VDRAdmin-AM-3.4.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-04-28 12:15+0200\n" +"POT-Creation-Date: 2006-05-11 16:09+0200\n" "PO-Revision-Date: 2006-04-26 13:53+0100\n" "Last-Translator: Oleg Roitburd <oleg@roitburd.de>\n" "Language-Team: Allrussian <LL.org>\n" @@ -190,7 +190,7 @@ msgstr "½ÐçÐÛÞ:" #: ../template/default/prog_timeline.html:108 #: ../template/default/prog_timeline.html:123 #: ../template/default/at_timer_new.html:111 -#: ../template/default/at_timer_new.html:122 ../vdradmind.pl:3981 +#: ../template/default/at_timer_new.html:122 ../vdradmind.pl:3977 msgid "o'clock" msgstr "ÇÐáÞÒ" @@ -373,7 +373,7 @@ msgstr "ÃÔÐÛØâì ÒáÕ ÒëÑàÐÝÝëÕ °ÒâÞâÐÙÜÕàë?" #: ../template/default/prog_summary.html:7 #: ../template/default/prog_timeline.html:7 -#: ../template/default/navigation.html:30 ../vdradmind.pl:4558 +#: ../template/default/navigation.html:30 ../vdradmind.pl:4573 msgid "What's On Now?" msgstr "ÇâÞ ØÔÕâ áÕÙçÐá?" @@ -498,7 +498,7 @@ msgstr "¿ÐàÞÛì ÔÛï ÓÞáâï:" #: ../template/default/config.html:213 ../template/default/help_config.html:38 #: ../template/default/help_config.html:86 -#: ../template/default/navigation.html:38 ../vdradmind.pl:4560 +#: ../template/default/navigation.html:38 ../vdradmind.pl:4573 msgid "Timeline" msgstr "³àÐäØÚ ÒàÕÜÕÝØ" @@ -767,7 +767,7 @@ msgid "Delete Selected Timers" msgstr "ÃÔÐÛØâì ÒëÑàÐÝÝëÕ âÐÙÜÕàë" #: ../template/default/prog_list.html:6 ../template/default/navigation.html:42 -#: ../vdradmind.pl:4561 +#: ../vdradmind.pl:4573 msgid "Channels" msgstr "ÂÕÛÕÓØÔ" @@ -833,7 +833,7 @@ msgstr "¸áÚÐâì äØÛìÜ Ò Internet-Movie-Database (IMDb)" #: ../template/default/rec_list.html:6 ../template/default/rec_list.html:18 #: ../template/default/help_rec_list.html:6 #: ../template/default/help_rec_list.html:18 -#: ../template/default/navigation.html:54 ../vdradmind.pl:4563 +#: ../template/default/navigation.html:54 ../vdradmind.pl:4573 msgid "Recordings" msgstr "·ÐßØáØ" @@ -1298,7 +1298,7 @@ msgid "to" msgstr "ÔÞ" #: ../template/default/prog_list2.html:6 -#: ../template/default/navigation.html:34 ../vdradmind.pl:2637 +#: ../template/default/navigation.html:34 ../vdradmind.pl:2676 msgid "Playing Today" msgstr "ÇâÞ ÑãÔÕâ áÕÓÞÔÝï?" @@ -1946,23 +1946,27 @@ msgstr "½ÕÜÕæÚØÙ:" msgid "Spanish:" msgstr "¸áßÐÝáÚØÙ:" -#: ../template/default/about.html:102 +#: ../template/default/about.html:94 +msgid "Russian:" +msgstr "" + +#: ../template/default/about.html:108 msgid "Informations" msgstr "¸ÝäÞàÜÐæØï" -#: ../template/default/about.html:112 +#: ../template/default/about.html:118 msgid "VDRAdmin-AM version:" msgstr "²ÕàáØï VDRAdmin-AM:" -#: ../template/default/about.html:118 +#: ../template/default/about.html:124 msgid "VDR version:" msgstr "²ÕàáØï VDR:" -#: ../template/default/about.html:132 +#: ../template/default/about.html:138 msgid "Getting Help and Reporting Bugs" msgstr "¿ÞÛãçØâì ßÞÜÞéì Ø áÞÞÑéØâì ÞÑ ÞèØÑÚÕ" -#: ../template/default/about.html:144 +#: ../template/default/about.html:150 msgid "" "If you need help please first try to use the online help you'll find on some " "pages. You can access it by clicking <img src=\"bilder/help.gif\"/>." @@ -1971,7 +1975,7 @@ msgstr "" "ØÝâÕàÐÚâØÒÝÞÙ ßÞÜÞéØ, ÚÞâÞàÐï ÔÞáâãßÝÐ ÝÐ ÝÕÚÞâÞàëå áâàÐÝØæÐå. ²ë ÜÞÖÕâÕ " "Òë×ëÒÐâì ÕÕ ÝÐÖØÜÐï ÝÐ <img src=\"bilder/help.gif\"/>." -#: ../template/default/about.html:145 +#: ../template/default/about.html:151 msgid "" "If this doesn't provide the information you need you can try to get help at " "<a href=\"http://www.vdrportal.de\" target=\"_blank\">VDR-Portal</a> if you " @@ -1982,7 +1986,7 @@ msgstr "" "ßÞßëâÐâìáï ßÞÛãçØâì ßÞÜÞéì Ò <a href=\"http://www.allrussian.info/board.php?" "boardid=61 \"target=\"_blank\">Allrussian VDR äÞàãÜÕ</a>. ¸éØâÕ ÔÛï íâÞÓÞ:" -#: ../template/default/about.html:146 +#: ../template/default/about.html:152 msgid "" "If you think you have found a bug please check that it's a new one and " "report it in the <a href=\"http://www.vdr-developer.org/mantisbt/main_page." @@ -2013,117 +2017,117 @@ msgstr "ºÞÜÜÐÝÔë Ø× commands.conf:" msgid "Output" msgstr "²ëÒÞÔ" -#: ../vdradmind.pl:296 +#: ../vdradmind.pl:312 msgid "What's your VDR hostname (e.g video.intra.net)?" msgstr "¸Üï åÞáâÐ VDR (ÝÐßàØÜÕà, video.intra.net)?" -#: ../vdradmind.pl:297 +#: ../vdradmind.pl:313 msgid "On which port does VDR listen to SVDRP queries?" msgstr "ºÐÚÞÙ ßÞàâ ØáßÞÛì×ãÕâ VDR ÔÛï ×ÐßàÞáÞÒ SVDRP?" -#: ../vdradmind.pl:298 +#: ../vdradmind.pl:314 msgid "On which address should VDRAdmin-AM listen (0.0.0.0 for any)?" msgstr "" "¿Þ ÚÐÚÞÜã ÐÔàÕáã VDRAdmin-AM ÔÞÛÖÕÝ ÖÔÐâì áÞÕÔØÝÕÝØï (0.0.0.0 ßÞÒáÕÜ)? " -#: ../vdradmind.pl:299 +#: ../vdradmind.pl:315 msgid "On which port should VDRAdmin-AM listen?" msgstr "ºÐÚÞÙ ÝÞÜÕà ßÞàâÐ ÔÞÛÖÕÝ ØáßÞÛì×ÞÒÐâì VDRAdmin-AM?" -#: ../vdradmind.pl:300 +#: ../vdradmind.pl:316 msgid "Username?" msgstr "¸Üï ßÞÛì×ÞÒÐâÕÛï?" -#: ../vdradmind.pl:301 +#: ../vdradmind.pl:317 msgid "Password?" msgstr "¿ÐàÞÛì?" -#: ../vdradmind.pl:302 +#: ../vdradmind.pl:318 msgid "Where are your recordings stored?" msgstr "¿Þ ÚÐÚÞÜã ÐÔàÕáã ÝÐåÞÔïâáï ×ÐßØáØ?" -#: ../vdradmind.pl:303 +#: ../vdradmind.pl:319 msgid "Where are your VDR's configuration files located?" msgstr "¿Þ ÚÐÚÞÜã ÐÔàÕáã ÝÐåÞÔïâáï ÚÞÝäØÓãàÐæØÞÝÝëÕ äÐÙÛë VDR?" -#: ../vdradmind.pl:309 +#: ../vdradmind.pl:326 msgid "Config file written successfully." msgstr "ÄÐÙÛ ÚÞÝäØÓãàÐæØØ ãáßÕèÝÞ ×ÐßØáÐÝ." -#: ../vdradmind.pl:362 +#: ../vdradmind.pl:381 #, perl-format msgid "vdradmind.pl %s started with pid %d." msgstr "vdradmind.pl %s ÑëÛ ×ÐßãéÕÝ á PID-ÞÜ %d." -#: ../vdradmind.pl:418 ../vdradmind.pl:1015 ../vdradmind.pl:1947 +#: ../vdradmind.pl:440 ../vdradmind.pl:1038 ../vdradmind.pl:1998 msgid "Not found" msgstr "½Õ ÝÐÙÔÕÝÞ" -#: ../vdradmind.pl:418 ../vdradmind.pl:1948 +#: ../vdradmind.pl:440 ../vdradmind.pl:1999 msgid "The requested URL was not found on this server!" msgstr "·ÐâàÕÑÞÒÐÝÝëÙ URL ÝÕ ÑëÛ ÝÐÙÔÕÝ ÝÐ íâÞÜ áÕàÒÕàÕ!" -#: ../vdradmind.pl:487 ../vdradmind.pl:1011 ../vdradmind.pl:1950 +#: ../vdradmind.pl:510 ../vdradmind.pl:1034 ../vdradmind.pl:2001 msgid "Forbidden" msgstr "·ÐßàÕéÕÝÞ" -#: ../vdradmind.pl:487 ../vdradmind.pl:1951 +#: ../vdradmind.pl:510 ../vdradmind.pl:2002 msgid "You don't have permission to access this function!" msgstr "à ÒÐá ÝÕÔÞáâÐâÞçÝÞ ßàÐÒ ÔÛï Òë×ÞÒÐ íâÞÙ äãÝÚæØØ!" -#: ../vdradmind.pl:1011 ../vdradmind.pl:1952 +#: ../vdradmind.pl:1034 ../vdradmind.pl:2003 #, perl-format msgid "Access to file \"%s\" denied!" msgstr "² ÔÞáâãßÕ Ú äÐÙÛã \"%s\" ÞâÚÐ×ÐÝÝÞ!" -#: ../vdradmind.pl:1015 ../vdradmind.pl:1949 +#: ../vdradmind.pl:1038 ../vdradmind.pl:2000 #, perl-format msgid "The URL \"%s\" was not found on this server!" msgstr "URL \"%s\" ÝÕ ÑëÛ ÝÐÙÔÕÝ ÝÐ íâÞÜ áÕàÒÕàÕ!" -#: ../vdradmind.pl:1953 +#: ../vdradmind.pl:2004 #, perl-format msgid "Can't open file \"%s\"!" msgstr "½Õ ÜÞÖÕâ ÞâÚàëâì äÐÙÛ \"%s\"!" -#: ../vdradmind.pl:1954 +#: ../vdradmind.pl:2005 #, perl-format msgid "" "Can't connect to VDR at %s:%s<br /><br />Please check if VDR is running and " "if VDR's svdrphosts.conf is configured correctly." msgstr "" -#: ../vdradmind.pl:1955 +#: ../vdradmind.pl:2006 #, perl-format msgid "Error while sending command to VDR at %s" msgstr "¾èØÑÚÐ ßàØ ÞâßàÐÒÛÕÝØØ ÚÞÜÐÝÔë Ú %s" -#: ../vdradmind.pl:2637 +#: ../vdradmind.pl:2676 msgid "Playing Tomorrow" msgstr "¿àÞÓàÐÜÜÐ ÝÐ ×ÐÒâàÐ" -#: ../vdradmind.pl:2637 +#: ../vdradmind.pl:2676 #, perl-format msgid "Playing on the %d." msgstr "ÇâÞ ÑãÔÕâ %d." -#: ../vdradmind.pl:3981 +#: ../vdradmind.pl:3977 msgid "Suitable matches for:" msgstr "ÀÕ×ãÛìâÐâë ßÞØáÚÐ ÔÛï" -#: ../vdradmind.pl:4036 +#: ../vdradmind.pl:4034 msgid "Schedule" msgstr "ÀÐáßØáÐÝØÕ" -#: ../vdradmind.pl:4559 +#: ../vdradmind.pl:4573 msgid "Playing Today?" msgstr "ÇâÞ ÑãÔÕâ áÕÓÞÔÝï?" -#: ../vdradmind.pl:4562 +#: ../vdradmind.pl:4573 msgid "Timers" msgstr "ÂÐÙÜÕàë" -#: ../vdradmind.pl:4625 +#: ../vdradmind.pl:4641 msgid "System default" msgstr "ÁØáâÕÜÝëÙ áâÐÝÔÐàâ" diff --git a/po/vdradmin.pot b/po/vdradmin.pot index 3db9be9..482a126 100644 --- a/po/vdradmin.pot +++ b/po/vdradmin.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-04-28 12:15+0200\n" +"POT-Creation-Date: 2006-05-11 16:09+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -181,7 +181,7 @@ msgstr "" #: ../template/default/prog_timeline.html:108 #: ../template/default/prog_timeline.html:123 #: ../template/default/at_timer_new.html:111 -#: ../template/default/at_timer_new.html:122 ../vdradmind.pl:3981 +#: ../template/default/at_timer_new.html:122 ../vdradmind.pl:3977 msgid "o'clock" msgstr "" @@ -360,7 +360,7 @@ msgstr "" #: ../template/default/prog_summary.html:7 #: ../template/default/prog_timeline.html:7 -#: ../template/default/navigation.html:30 ../vdradmind.pl:4558 +#: ../template/default/navigation.html:30 ../vdradmind.pl:4573 msgid "What's On Now?" msgstr "" @@ -485,7 +485,7 @@ msgstr "" #: ../template/default/config.html:213 ../template/default/help_config.html:38 #: ../template/default/help_config.html:86 -#: ../template/default/navigation.html:38 ../vdradmind.pl:4560 +#: ../template/default/navigation.html:38 ../vdradmind.pl:4573 msgid "Timeline" msgstr "" @@ -754,7 +754,7 @@ msgid "Delete Selected Timers" msgstr "" #: ../template/default/prog_list.html:6 ../template/default/navigation.html:42 -#: ../vdradmind.pl:4561 +#: ../vdradmind.pl:4573 msgid "Channels" msgstr "" @@ -820,7 +820,7 @@ msgstr "" #: ../template/default/rec_list.html:6 ../template/default/rec_list.html:18 #: ../template/default/help_rec_list.html:6 #: ../template/default/help_rec_list.html:18 -#: ../template/default/navigation.html:54 ../vdradmind.pl:4563 +#: ../template/default/navigation.html:54 ../vdradmind.pl:4573 msgid "Recordings" msgstr "" @@ -1192,7 +1192,7 @@ msgid "to" msgstr "" #: ../template/default/prog_list2.html:6 -#: ../template/default/navigation.html:34 ../vdradmind.pl:2637 +#: ../template/default/navigation.html:34 ../vdradmind.pl:2676 msgid "Playing Today" msgstr "" @@ -1659,29 +1659,33 @@ msgstr "" msgid "Spanish:" msgstr "" -#: ../template/default/about.html:102 +#: ../template/default/about.html:94 +msgid "Russian:" +msgstr "" + +#: ../template/default/about.html:108 msgid "Informations" msgstr "" -#: ../template/default/about.html:112 +#: ../template/default/about.html:118 msgid "VDRAdmin-AM version:" msgstr "" -#: ../template/default/about.html:118 +#: ../template/default/about.html:124 msgid "VDR version:" msgstr "" -#: ../template/default/about.html:132 +#: ../template/default/about.html:138 msgid "Getting Help and Reporting Bugs" msgstr "" -#: ../template/default/about.html:144 +#: ../template/default/about.html:150 msgid "" "If you need help please first try to use the online help you'll find on some " "pages. You can access it by clicking <img src=\"bilder/help.gif\"/>." msgstr "" -#: ../template/default/about.html:145 +#: ../template/default/about.html:151 msgid "" "If this doesn't provide the information you need you can try to get help at " "<a href=\"http://www.vdrportal.de\" target=\"_blank\">VDR-Portal</a> if you " @@ -1689,7 +1693,7 @@ msgid "" "search for:" msgstr "" -#: ../template/default/about.html:146 +#: ../template/default/about.html:152 msgid "" "If you think you have found a bug please check that it's a new one and " "report it in the <a href=\"http://www.vdr-developer.org/mantisbt/main_page." @@ -1716,115 +1720,115 @@ msgstr "" msgid "Output" msgstr "" -#: ../vdradmind.pl:296 +#: ../vdradmind.pl:312 msgid "What's your VDR hostname (e.g video.intra.net)?" msgstr "" -#: ../vdradmind.pl:297 +#: ../vdradmind.pl:313 msgid "On which port does VDR listen to SVDRP queries?" msgstr "" -#: ../vdradmind.pl:298 +#: ../vdradmind.pl:314 msgid "On which address should VDRAdmin-AM listen (0.0.0.0 for any)?" msgstr "" -#: ../vdradmind.pl:299 +#: ../vdradmind.pl:315 msgid "On which port should VDRAdmin-AM listen?" msgstr "" -#: ../vdradmind.pl:300 +#: ../vdradmind.pl:316 msgid "Username?" msgstr "" -#: ../vdradmind.pl:301 +#: ../vdradmind.pl:317 msgid "Password?" msgstr "" -#: ../vdradmind.pl:302 +#: ../vdradmind.pl:318 msgid "Where are your recordings stored?" msgstr "" -#: ../vdradmind.pl:303 +#: ../vdradmind.pl:319 msgid "Where are your VDR's configuration files located?" msgstr "" -#: ../vdradmind.pl:309 +#: ../vdradmind.pl:326 msgid "Config file written successfully." msgstr "" -#: ../vdradmind.pl:362 +#: ../vdradmind.pl:381 #, perl-format msgid "vdradmind.pl %s started with pid %d." msgstr "" -#: ../vdradmind.pl:418 ../vdradmind.pl:1015 ../vdradmind.pl:1947 +#: ../vdradmind.pl:440 ../vdradmind.pl:1038 ../vdradmind.pl:1998 msgid "Not found" msgstr "" -#: ../vdradmind.pl:418 ../vdradmind.pl:1948 +#: ../vdradmind.pl:440 ../vdradmind.pl:1999 msgid "The requested URL was not found on this server!" msgstr "" -#: ../vdradmind.pl:487 ../vdradmind.pl:1011 ../vdradmind.pl:1950 +#: ../vdradmind.pl:510 ../vdradmind.pl:1034 ../vdradmind.pl:2001 msgid "Forbidden" msgstr "" -#: ../vdradmind.pl:487 ../vdradmind.pl:1951 +#: ../vdradmind.pl:510 ../vdradmind.pl:2002 msgid "You don't have permission to access this function!" msgstr "" -#: ../vdradmind.pl:1011 ../vdradmind.pl:1952 +#: ../vdradmind.pl:1034 ../vdradmind.pl:2003 #, perl-format msgid "Access to file \"%s\" denied!" msgstr "" -#: ../vdradmind.pl:1015 ../vdradmind.pl:1949 +#: ../vdradmind.pl:1038 ../vdradmind.pl:2000 #, perl-format msgid "The URL \"%s\" was not found on this server!" msgstr "" -#: ../vdradmind.pl:1953 +#: ../vdradmind.pl:2004 #, perl-format msgid "Can't open file \"%s\"!" msgstr "" -#: ../vdradmind.pl:1954 +#: ../vdradmind.pl:2005 #, perl-format msgid "" "Can't connect to VDR at %s:%s<br /><br />Please check if VDR is running and " "if VDR's svdrphosts.conf is configured correctly." msgstr "" -#: ../vdradmind.pl:1955 +#: ../vdradmind.pl:2006 #, perl-format msgid "Error while sending command to VDR at %s" msgstr "" -#: ../vdradmind.pl:2637 +#: ../vdradmind.pl:2676 msgid "Playing Tomorrow" msgstr "" -#: ../vdradmind.pl:2637 +#: ../vdradmind.pl:2676 #, perl-format msgid "Playing on the %d." msgstr "" -#: ../vdradmind.pl:3981 +#: ../vdradmind.pl:3977 msgid "Suitable matches for:" msgstr "" -#: ../vdradmind.pl:4036 +#: ../vdradmind.pl:4034 msgid "Schedule" msgstr "" -#: ../vdradmind.pl:4559 +#: ../vdradmind.pl:4573 msgid "Playing Today?" msgstr "" -#: ../vdradmind.pl:4562 +#: ../vdradmind.pl:4573 msgid "Timers" msgstr "" -#: ../vdradmind.pl:4625 +#: ../vdradmind.pl:4641 msgid "System default" msgstr "" diff --git a/template/default/about.html b/template/default/about.html index ac6c551..ee1764c 100644 --- a/template/default/about.html +++ b/template/default/about.html @@ -74,7 +74,7 @@ <tr class="row_even"> <td class="col_left"></td> <td class="col_label" width="100px"><h4><%! French: !%></h4></td> - <td class="col_value"><!-- <%! At the moment unmaintained, former translations by: !%> -->Trois Six, map, lobotomise, bads</td> + <td class="col_value"><!-- <%! At the moment unmaintained, former translations by: !%> -->Trois Six, Pierre ERRAUD, map, lobotomise, bads</td> <td class="col_right"></td> </tr> <tr class="row_even"> @@ -89,6 +89,12 @@ <td class="col_value">Rüdiger Jung</td> <td class="col_right"></td> </tr> + <tr class="row_odd"> + <td class="col_left"></td> + <td class="col_label" width="100px"><h4><%! Russian: !%></h4></td> + <td class="col_value">Oleg Roitburd and Allrussian-forum translation team</td> + <td class="col_right"></td> + </tr> <tr class="footer"> <td class="col_left"></td> <td colspan="2"></td> diff --git a/vdradmind.pl b/vdradmind.pl index eab5589..aea9fbc 100755 --- a/vdradmind.pl +++ b/vdradmind.pl @@ -1,5 +1,5 @@ #!/usr/bin/perl - +# vim:et:sw=4:ts=4: # # vdradmin.pl by Thomas Koch <tom@linvdr.org> # @@ -7,13 +7,13 @@ # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. -# +# # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software @@ -30,21 +30,22 @@ require 5.004; my $BASENAME; my $EXENAME; + BEGIN { - $0 =~ /(^.*\/)/; - $EXENAME = $0; - $BASENAME = $1; - unshift(@INC, "/usr/share/vdradmin/lib"); - unshift(@INC, $BASENAME . "lib/"); + $0 =~ /(^.*\/)/; + $EXENAME = $0; + $BASENAME = $1; + unshift(@INC, "/usr/share/vdradmin/lib"); + unshift(@INC, $BASENAME . "lib/"); } my $localemod; if (eval { require Locale::gettext }) { - $localemod = 'Locale::gettext'; + $localemod = 'Locale::gettext'; } elsif (eval { require Locale::Messages }) { - $localemod = 'Locale::Messages'; + $localemod = 'Locale::Messages'; } else { - die("Locale::gettext or Locale::Messages is required!\n"); + die("Locale::gettext or Locale::Messages is required!\n"); } $localemod->import(qw(gettext bindtextdomain textdomain)); @@ -64,42 +65,44 @@ use Shell qw(ps locale); use URI::Escape; my $can_use_net_smtp = 1; -$can_use_net_smtp = undef unless(eval {require Net::SMTP}); +$can_use_net_smtp = undef unless (eval { require Net::SMTP }); my $can_use_smtpauth = 1; -$can_use_smtpauth = undef unless(eval {require Authen::SASL}); +$can_use_smtpauth = undef unless (eval { require Authen::SASL }); + #Authen::SASL->import(qw(Perl)) if($can_use_smtpauth); # Some users have problems if the LANGUAGE env variable is set # so it's cleared here. -$LANGUAGE=""; +$LANGUAGE = ""; $SIG{CHLD} = sub { wait }; use strict; + #use warnings; -my $SEARCH_FILES_IN_SYSTEM = 0; -my $VDR_MAX_SVDRP_LENGTH = 10000; # validate this value +my $SEARCH_FILES_IN_SYSTEM = 0; +my $VDR_MAX_SVDRP_LENGTH = 10000; # validate this value my $SUPPORTED_LOCALE_PREFIXES = "^(de|en|es|fi|fr|nl|ru)_"; my $AT_BY_EVENT_ID = 2; my $AT_BY_TIME = 1; my $AT_OFF = 0; -sub true () { 1 }; -sub false () { 0 }; -sub CRLF () { "\r\n" }; -sub LOG_ACCESS () { 1 }; -sub LOG_SERVERCOM () { 2 }; -sub LOG_VDRCOM () { 4 }; -sub LOG_STATS () { 8 }; -sub LOG_AT () { 16 }; -sub LOG_CHECKTIMER () { 32 }; -sub LOG_FATALERROR () { 64 }; -sub LOG_DEBUG () { 32768 }; +sub true () { 1 } +sub false () { 0 } +sub CRLF () { "\r\n" } +sub LOG_ACCESS () { 1 } +sub LOG_SERVERCOM () { 2 } +sub LOG_VDRCOM () { 4 } +sub LOG_STATS () { 8 } +sub LOG_AT () { 16 } +sub LOG_CHECKTIMER () { 32 } +sub LOG_FATALERROR () { 64 } +sub LOG_DEBUG () { 32768 } my %CONFIG; -$CONFIG{LOGLEVEL} = 81; # 32799 +$CONFIG{LOGLEVEL} = 81; # 32799 $CONFIG{LOGGING} = 0; $CONFIG{LOGFILE} = "vdradmind.log"; $CONFIG{MOD_GZIP} = 0; @@ -107,68 +110,78 @@ $CONFIG{CACHE_TIMEOUT} = 60; $CONFIG{CACHE_LASTUPDATE} = 0; $CONFIG{CACHE_REC_TIMEOUT} = 60; $CONFIG{CACHE_REC_LASTUPDATE} = 0; + # -$CONFIG{VDR_HOST} = "localhost"; -$CONFIG{VDR_PORT} = 2001; -$CONFIG{SERVERHOST} = "0.0.0.0"; -$CONFIG{SERVERPORT} = 8001; -$CONFIG{LOCAL_NET} = "0.0.0.0/32"; -$CONFIG{VIDEODIR} = "/video"; -$CONFIG{VDRCONFDIR} = "$CONFIG{VIDEODIR}"; -$CONFIG{EPGIMAGES} = "$CONFIG{VIDEODIR}/epgimages"; -$CONFIG{VDRVFAT} = 1; +$CONFIG{VDR_HOST} = "localhost"; +$CONFIG{VDR_PORT} = 2001; +$CONFIG{SERVERHOST} = "0.0.0.0"; +$CONFIG{SERVERPORT} = 8001; +$CONFIG{LOCAL_NET} = "0.0.0.0/32"; +$CONFIG{VIDEODIR} = "/video"; +$CONFIG{VDRCONFDIR} = "$CONFIG{VIDEODIR}"; +$CONFIG{EPGIMAGES} = "$CONFIG{VIDEODIR}/epgimages"; +$CONFIG{VDRVFAT} = 1; + # -$CONFIG{TEMPLATE} = "default"; -$CONFIG{SKIN} = "bilder"; -$CONFIG{LOGINPAGE} = 0; -$CONFIG{RECORDINGS} = 1; -$CONFIG{LANG} = ""; +$CONFIG{TEMPLATE} = "default"; +$CONFIG{SKIN} = "bilder"; +$CONFIG{LOGINPAGE} = 0; +$CONFIG{RECORDINGS} = 1; +$CONFIG{LANG} = ""; + # -$CONFIG{USERNAME} = "linvdr"; -$CONFIG{PASSWORD} = "linvdr"; -$CONFIG{GUEST_ACCOUNT} = 0; -$CONFIG{USERNAME_GUEST} = "guest"; -$CONFIG{PASSWORD_GUEST} = "guest"; +$CONFIG{USERNAME} = "linvdr"; +$CONFIG{PASSWORD} = "linvdr"; +$CONFIG{GUEST_ACCOUNT} = 0; +$CONFIG{USERNAME_GUEST} = "guest"; +$CONFIG{PASSWORD_GUEST} = "guest"; + # -$CONFIG{ZEITRAHMEN} = 1; -$CONFIG{TIMES} = "18:00, 20:00, 21:00, 22:00"; -$CONFIG{TL_TOOLTIP} = 1; +$CONFIG{ZEITRAHMEN} = 1; +$CONFIG{TIMES} = "18:00, 20:00, 21:00, 22:00"; +$CONFIG{TL_TOOLTIP} = 1; + # -$CONFIG{AT_FUNC} = 1; -$CONFIG{AT_TIMEOUT} = 120; -$CONFIG{AT_LIFETIME} = 99; -$CONFIG{AT_PRIORITY} = 99; -$CONFIG{AT_MARGIN_BEGIN} = 10; -$CONFIG{AT_MARGIN_END} = 10; -$CONFIG{AT_TOOLTIP} = 1; +$CONFIG{AT_FUNC} = 1; +$CONFIG{AT_TIMEOUT} = 120; +$CONFIG{AT_LIFETIME} = 99; +$CONFIG{AT_PRIORITY} = 99; +$CONFIG{AT_MARGIN_BEGIN} = 10; +$CONFIG{AT_MARGIN_END} = 10; +$CONFIG{AT_TOOLTIP} = 1; + # -$CONFIG{TM_LIFETIME} = 99; -$CONFIG{TM_PRIORITY} = 99; -$CONFIG{TM_MARGIN_BEGIN} = 10; -$CONFIG{TM_MARGIN_END} = 10; -$CONFIG{TM_TT_TIMELINE} = 1; -$CONFIG{TM_TT_LIST} = 1; +$CONFIG{TM_LIFETIME} = 99; +$CONFIG{TM_PRIORITY} = 99; +$CONFIG{TM_MARGIN_BEGIN} = 10; +$CONFIG{TM_MARGIN_END} = 10; +$CONFIG{TM_TT_TIMELINE} = 1; +$CONFIG{TM_TT_LIST} = 1; + #$CONFIG{TM_ADD_SUMMARY} = 0; # -$CONFIG{ST_FUNC} = 1; -$CONFIG{ST_REC_ON} = 0; -$CONFIG{ST_LIVE_ON} = 1; -$CONFIG{ST_URL} = ""; -$CONFIG{ST_STREAMDEV_PORT}= 3000; -$CONFIG{ST_VIDEODIR} = ""; +$CONFIG{ST_FUNC} = 1; +$CONFIG{ST_REC_ON} = 0; +$CONFIG{ST_LIVE_ON} = 1; +$CONFIG{ST_URL} = ""; +$CONFIG{ST_STREAMDEV_PORT} = 3000; +$CONFIG{ST_VIDEODIR} = ""; + # -$CONFIG{EPG_DIRECT} = 0; -$CONFIG{EPG_FILENAME} = "$CONFIG{VIDEODIR}/epg.data"; -$CONFIG{EPG_PRUNE} = 0; -$CONFIG{NO_EVENTID} = 0; -$CONFIG{NO_EVENTID_ON} = ""; +$CONFIG{EPG_DIRECT} = 0; +$CONFIG{EPG_FILENAME} = "$CONFIG{VIDEODIR}/epg.data"; +$CONFIG{EPG_PRUNE} = 0; +$CONFIG{NO_EVENTID} = 0; +$CONFIG{NO_EVENTID_ON} = ""; + # -$CONFIG{AT_SENDMAIL} = 0; # set to 1 and set all the "MAIL_" things if you want email notification on new autotimers. -$CONFIG{MAIL_FROM} = "from\@address.tld"; -$CONFIG{MAIL_TO} = "your\@email.address"; -$CONFIG{MAIL_SERVER} = "your.email.server"; -$CONFIG{MAIL_AUTH_USER} = ""; -$CONFIG{MAIL_AUTH_PASS} = ""; +$CONFIG{AT_SENDMAIL} = 0; # set to 1 and set all the "MAIL_" things if you want email notification on new autotimers. +$CONFIG{MAIL_FROM} = "from\@address.tld"; +$CONFIG{MAIL_TO} = "your\@email.address"; +$CONFIG{MAIL_SERVER} = "your.email.server"; +$CONFIG{MAIL_AUTH_USER} = ""; +$CONFIG{MAIL_AUTH_PASS} = ""; + # $CONFIG{CHANNELS_WANTED} = ""; $CONFIG{CHANNELS_WANTED_AUTOTIMER} = ""; @@ -177,46 +190,48 @@ $CONFIG{CHANNELS_WANTED_PRG2} = ""; $CONFIG{CHANNELS_WANTED_TIMELINE} = ""; $CONFIG{CHANNELS_WANTED_SUMMARY} = ""; $CONFIG{CHANNELS_WANTED_WATCHTV} = ""; + # $CONFIG{PROG_SUMMARY_COLS} = 3; + # $CONFIG{TV_MIMETYPE} = "video/x-mpegurl"; $CONFIG{TV_EXT} = "m3u"; $CONFIG{REC_MIMETYPE} = "video/x-mpegurl"; $CONFIG{REC_EXT} = "m3u"; -my $VERSION = "3.4.5rc"; -my $SERVERVERSION = "vdradmind/$VERSION"; -my $LINVDR = isLinVDR(); -my $VDRVERSION = 0; # Numeric VDR version, e.g. 10344 -my $VDRVERSION_HR; # Human readable VDR version, e.g. 1.3.44 +my $VERSION = "3.4.5"; +my $SERVERVERSION = "vdradmind/$VERSION"; +my $LINVDR = isLinVDR(); +my $VDRVERSION = 0; # Numeric VDR version, e.g. 10344 +my $VDRVERSION_HR; # Human readable VDR version, e.g. 1.3.44 my %ERROR_MESSAGE; -my($TEMPLATEDIR, $CONFFILE, $LOGFILE, $PIDFILE, $AT_FILENAME, $DONE_FILENAME, $BL_FILENAME, $ETCDIR, $USER_CSS); -if(!$SEARCH_FILES_IN_SYSTEM) { - $ETCDIR = "${BASENAME}"; - $TEMPLATEDIR = "${BASENAME}template"; - $CONFFILE = "${BASENAME}vdradmind.conf"; - $LOGFILE = "${BASENAME}$CONFIG{LOGFILE}"; - $PIDFILE = "${BASENAME}vdradmind.pid"; - $AT_FILENAME = "${BASENAME}vdradmind.at"; - $DONE_FILENAME = "${BASENAME}vdradmind.done"; - $BL_FILENAME = "${BASENAME}vdradmind.bl"; - $USER_CSS = "${BASENAME}user.css"; - bindtextdomain("vdradmin", "${BASENAME}locale"); +my ($TEMPLATEDIR, $CONFFILE, $LOGFILE, $PIDFILE, $AT_FILENAME, $DONE_FILENAME, $BL_FILENAME, $ETCDIR, $USER_CSS); +if (!$SEARCH_FILES_IN_SYSTEM) { + $ETCDIR = "${BASENAME}"; + $TEMPLATEDIR = "${BASENAME}template"; + $CONFFILE = "${BASENAME}vdradmind.conf"; + $LOGFILE = "${BASENAME}$CONFIG{LOGFILE}"; + $PIDFILE = "${BASENAME}vdradmind.pid"; + $AT_FILENAME = "${BASENAME}vdradmind.at"; + $DONE_FILENAME = "${BASENAME}vdradmind.done"; + $BL_FILENAME = "${BASENAME}vdradmind.bl"; + $USER_CSS = "${BASENAME}user.css"; + bindtextdomain("vdradmin", "${BASENAME}locale"); } else { - $ETCDIR = "/etc/vdradmin"; - $TEMPLATEDIR = "/usr/share/vdradmin/template"; - $LOGFILE = "/var/log/$CONFIG{LOGFILE}"; - $PIDFILE = "/var/run/vdradmind.pid"; - $CONFFILE = "${ETCDIR}/vdradmind.conf"; - $AT_FILENAME = "${ETCDIR}/vdradmind.at"; - $DONE_FILENAME = "${ETCDIR}/vdradmind.done"; - $BL_FILENAME = "${ETCDIR}/vdradmind.bl"; - $USER_CSS = "${ETCDIR}/user.css"; - bindtextdomain("vdradmin", "/usr/share/locale"); -} -my $DONE = &DONE_Read || {}; + $ETCDIR = "/etc/vdradmin"; + $TEMPLATEDIR = "/usr/share/vdradmin/template"; + $LOGFILE = "/var/log/$CONFIG{LOGFILE}"; + $PIDFILE = "/var/run/vdradmind.pid"; + $CONFFILE = "${ETCDIR}/vdradmind.conf"; + $AT_FILENAME = "${ETCDIR}/vdradmind.at"; + $DONE_FILENAME = "${ETCDIR}/vdradmind.done"; + $BL_FILENAME = "${ETCDIR}/vdradmind.bl"; + $USER_CSS = "${ETCDIR}/user.css"; + bindtextdomain("vdradmin", "/usr/share/locale"); +} +my $DONE = &DONE_Read || {}; textdomain("vdradmin"); @@ -224,172 +239,178 @@ textdomain("vdradmin"); # IMHO a better Template Modul ;-) # some useful options (see below for full list) my $Xconfig = { - START_TAG => '\<\?\%', # Tagstyle - END_TAG => '\%\?\>', # Tagstyle - INCLUDE_PATH => $TEMPLATEDIR, # or list ref - INTERPOLATE => 0, # expand "$var" in plain text - PRE_CHOMP => 1, # cleanup whitespace - POST_CHOMP => 1, # cleanup whitespace - EVAL_PERL => 1, # evaluate Perl code blocks - CACHE_SIZE => 10000, # Tuning for Templates - COMPILE_EXT => 'cache', # Tuning for Templates - COMPILE_DIR => '/tmp', # Tuning for Templates -# DEBUG => DEBUG_ALL, + START_TAG => '\<\?\%', # Tagstyle + END_TAG => '\%\?\>', # Tagstyle + INCLUDE_PATH => $TEMPLATEDIR, # or list ref + INTERPOLATE => 0, # expand "$var" in plain text + PRE_CHOMP => 1, # cleanup whitespace + POST_CHOMP => 1, # cleanup whitespace + EVAL_PERL => 1, # evaluate Perl code blocks + CACHE_SIZE => 10000, # Tuning for Templates + COMPILE_EXT => 'cache', # Tuning for Templates + COMPILE_DIR => '/tmp', # Tuning for Templates + + #DEBUG => DEBUG_ALL, }; # create Template object my $Xtemplate = Template->new($Xconfig); + # ---- End new template section ---- -my $USE_SHELL_GZIP = false; # set on false to use the gzip library - -my($DEBUG) = 0; -my(%EPG, @CHAN, $q, $ACCEPT_GZIP, $SVDRP, $HOST, $low_time, @RECORDINGS); -my(%mimehash) = ( - html => "text/html", - png => "image/png", - gif => "image/gif", - jpg => "image/jpeg", - css => "text/css", - ico => "image/x-icon", - js => "application/x-javascript", - swf => "application/x-shockwave-flash" +my $USE_SHELL_GZIP = false; # set on false to use the gzip library + +my ($DEBUG) = 0; +my (%EPG, @CHAN, $q, $ACCEPT_GZIP, $SVDRP, $HOST, $low_time, @RECORDINGS); +my (%mimehash) = (html => "text/html", + png => "image/png", + gif => "image/gif", + jpg => "image/jpeg", + css => "text/css", + ico => "image/x-icon", + js => "application/x-javascript", + swf => "application/x-shockwave-flash" ); my @LOGINPAGES = qw(prog_summary prog_list2 prog_timeline prog_list timer_list rec_list); -$SIG{INT} = \&Shutdown; +$SIG{INT} = \&Shutdown; $SIG{TERM} = \&Shutdown; -$SIG{HUP} = \&HupSignal; +$SIG{HUP} = \&HupSignal; $SIG{PIPE} = 'IGNORE'; my $UserCSS; -$UserCSS = "user.css" if(-e "$USER_CSS"); +$UserCSS = "user.css" if (-e "$USER_CSS"); # my $DAEMON = 1; -for(my $i = 0; $i < scalar(@ARGV); $i++) { - $_ = $ARGV[$i]; - if(/-h|--help/) { - print("Usage $0 [OPTION]...\n"); - print("A perl client for the Linux Video Disk Recorder.\n\n"); - print(" -nf --nofork don't fork\n"); - print(" -c --config run configuration dialog\n"); - print(" -d [dir] --cfgdir [dir] use [dir] for configuration files\n"); - print(" -k --kill kill a forked vdradmind.pl\n"); - print(" -h --help this message\n"); - print("\nReport bugs to <mail\@andreas.vdr-developer.org>.\n"); - exit(0); - } - if(/--nofork|-nf/) { $DAEMON = 0; last; } - if(/--cfgdir|-d/) { - $ETCDIR = $ARGV[++$i]; - $CONFFILE = "${ETCDIR}/vdradmind.conf"; - $AT_FILENAME = "${ETCDIR}/vdradmind.at"; - $DONE_FILENAME = "${ETCDIR}/vdradmind.done"; - $BL_FILENAME = "${ETCDIR}/vdradmind.bl"; - $USER_CSS = "${ETCDIR}/user.css"; - next; - } - if(/--config|-c/) { - ReadConfig() if(-e $CONFFILE); - LoadTranslation(); - $CONFIG{VDR_HOST} = Question(gettext("What's your VDR hostname (e.g video.intra.net)?"), $CONFIG{VDR_HOST}); - $CONFIG{VDR_PORT} = Question(gettext("On which port does VDR listen to SVDRP queries?"), $CONFIG{VDR_PORT}); - $CONFIG{SERVERHOST} = Question(gettext("On which address should VDRAdmin-AM listen (0.0.0.0 for any)?"), $CONFIG{SERVERHOST}); - $CONFIG{SERVERPORT} = Question(gettext("On which port should VDRAdmin-AM listen?"), $CONFIG{SERVERPORT}); - $CONFIG{USERNAME} = Question(gettext("Username?"), $CONFIG{USERNAME}); - $CONFIG{PASSWORD} = Question(gettext("Password?"), $CONFIG{PASSWORD}); - $CONFIG{VIDEODIR} = Question(gettext("Where are your recordings stored?"), $CONFIG{VIDEODIR}); - $CONFIG{VDRCONFDIR} = Question(gettext("Where are your VDR's configuration files located?"), $CONFIG{VDRCONFDIR}); -# $CONFIG{EPG_FILENAME} = Question(gettext("Where is your epg.data?"), $CONFIG{EPG_FILENAME}); -# $CONFIG{EPG_DIRECT} = ($CONFIG{EPG_FILENAME} and -e $CONFIG{EPG_FILENAME} ? 1 : 0); - - WriteConfig(); - - print(gettext("Config file written successfully.") . "\n"); - exit(0); - } - if(/--kill|-k/) { - exit(0) unless(-e $PIDFILE); - my $killed = kill(2, getPID($PIDFILE)); - unlink($PIDFILE); - exit($killed > 0 ? 0 : 1); - } - if(/--displaycall|-i/) { - for(my $z = 0; $z < 5; $z++) { - DisplayMessage($ARGV[$i+1]); - sleep(3); - } - CloseSocket(); - exit(0); - } - if(/--message|-m/) { - DisplayMessage($ARGV[$i+1]); - CloseSocket(); - exit(0); - } - if(/-u/) { - # Don't use user.css - $UserCSS = undef; - } +for (my $i = 0 ; $i < scalar(@ARGV) ; $i++) { + $_ = $ARGV[$i]; + if (/-h|--help/) { + print("Usage $0 [OPTION]...\n"); + print("A perl client for the Linux Video Disk Recorder.\n\n"); + print(" -nf --nofork don't fork\n"); + print(" -c --config run configuration dialog\n"); + print(" -d [dir] --cfgdir [dir] use [dir] for configuration files\n"); + print(" -k --kill kill a forked vdradmind.pl\n"); + print(" -h --help this message\n"); + print("\nReport bugs to <mail\@andreas.vdr-developer.org>.\n"); + exit(0); + } + if (/--nofork|-nf/) { $DAEMON = 0; last; } + if (/--cfgdir|-d/) { + $ETCDIR = $ARGV[ ++$i ]; + $CONFFILE = "${ETCDIR}/vdradmind.conf"; + $AT_FILENAME = "${ETCDIR}/vdradmind.at"; + $DONE_FILENAME = "${ETCDIR}/vdradmind.done"; + $BL_FILENAME = "${ETCDIR}/vdradmind.bl"; + $USER_CSS = "${ETCDIR}/user.css"; + next; + } + if (/--config|-c/) { + ReadConfig() if (-e $CONFFILE); + LoadTranslation(); + $CONFIG{VDR_HOST} = Question(gettext("What's your VDR hostname (e.g video.intra.net)?"), $CONFIG{VDR_HOST}); + $CONFIG{VDR_PORT} = Question(gettext("On which port does VDR listen to SVDRP queries?"), $CONFIG{VDR_PORT}); + $CONFIG{SERVERHOST} = Question(gettext("On which address should VDRAdmin-AM listen (0.0.0.0 for any)?"), $CONFIG{SERVERHOST}); + $CONFIG{SERVERPORT} = Question(gettext("On which port should VDRAdmin-AM listen?"), $CONFIG{SERVERPORT}); + $CONFIG{USERNAME} = Question(gettext("Username?"), $CONFIG{USERNAME}); + $CONFIG{PASSWORD} = Question(gettext("Password?"), $CONFIG{PASSWORD}); + $CONFIG{VIDEODIR} = Question(gettext("Where are your recordings stored?"), $CONFIG{VIDEODIR}); + $CONFIG{VDRCONFDIR} = Question(gettext("Where are your VDR's configuration files located?"), $CONFIG{VDRCONFDIR}); + + #$CONFIG{EPG_FILENAME} = Question(gettext("Where is your epg.data?"), $CONFIG{EPG_FILENAME}); + #$CONFIG{EPG_DIRECT} = ($CONFIG{EPG_FILENAME} and -e $CONFIG{EPG_FILENAME} ? 1 : 0); + + WriteConfig(); + + print(gettext("Config file written successfully.") . "\n"); + exit(0); + } + if (/--kill|-k/) { + exit(0) unless (-e $PIDFILE); + my $killed = kill(2, getPID($PIDFILE)); + unlink($PIDFILE); + exit($killed > 0 ? 0 : 1); + } + if (/--displaycall|-i/) { + for (my $z = 0 ; $z < 5 ; $z++) { + DisplayMessage($ARGV[ $i + 1 ]); + sleep(3); + } + CloseSocket(); + exit(0); + } + if (/--message|-m/) { + DisplayMessage($ARGV[ $i + 1 ]); + CloseSocket(); + exit(0); + } + if (/-u/) { + + # Don't use user.css + $UserCSS = undef; + } } ReadConfig(); LoadTranslation(); -if($CONFIG{MOD_GZIP}) { - # lib gzipping - require Compress::Zlib; -} - -if(-e "$PIDFILE") { - my $pid = getPID($PIDFILE); - print("There's already a copy of this program running! (pid: $pid)\n"); - my $found; - foreach (ps("ax")) { - $found = 1 if(/$pid\s.*(\s|\/)$EXENAME.*/); - } - if ($found) { - print("If you feel this is an error, remove $PIDFILE!\n"); - exit(1); - } - print("The pid $pid is not a running $EXENAME process, so I'll start anyway.\n"); -} - -if($DAEMON) { - my($pid) = fork; - if($pid != 0) { - printf(gettext("vdradmind.pl %s started with pid %d.") . "\n", $VERSION, $pid); - writePID($pid); - exit(0); - } +if ($CONFIG{MOD_GZIP}) { + + # lib gzipping + require Compress::Zlib; +} + +if (-e "$PIDFILE") { + my $pid = getPID($PIDFILE); + print("There's already a copy of this program running! (pid: $pid)\n"); + my $found; + foreach (ps("ax")) { + $found = 1 if (/$pid\s.*(\s|\/)$EXENAME.*/); + } + if ($found) { + print("If you feel this is an error, remove $PIDFILE!\n"); + exit(1); + } + print("The pid $pid is not a running $EXENAME process, so I'll start anyway.\n"); +} + +if ($DAEMON) { + my ($pid) = fork; + if ($pid != 0) { + printf(gettext("vdradmind.pl %s started with pid %d.") . "\n", $VERSION, $pid); + writePID($pid); + exit(0); + } } $SIG{__DIE__} = \&Shutdown; my @reccmds = loadCommandsConf("$CONFIG{VDRCONFDIR}/reccmds.conf"); my @vdrcmds = loadCommandsConf("$CONFIG{VDRCONFDIR}/commands.conf"); -my($Socket) = IO::Socket::INET->new( - Proto => 'tcp', - LocalPort => $CONFIG{SERVERPORT}, - LocalAddr => $CONFIG{SERVERHOST}, - Listen => 10, - Reuse => 1 -); -die("can't start server: $!\n") if (!$Socket); -$Socket->timeout($CONFIG{AT_TIMEOUT} * 60) if($CONFIG{AT_FUNC}); +my ($Socket) = + IO::Socket::INET->new(Proto => 'tcp', + LocalPort => $CONFIG{SERVERPORT}, + LocalAddr => $CONFIG{SERVERHOST}, + Listen => 10, + Reuse => 1 + ); +die("can't start server: $!\n") if (!$Socket); +$Socket->timeout($CONFIG{AT_TIMEOUT} * 60) if ($CONFIG{AT_FUNC}); $CONFIG{CACHE_LASTUPDATE} = 0; ## # Mainloop ## -my($Client, $MyURL, $Referer, $Request, $Query, $Guest); +my ($Client, $MyURL, $Referer, $Request, $Query, $Guest); my @GUEST_USER = qw(prog_detail prog_list prog_list2 prog_timeline timer_list at_timer_list - prog_summary rec_list rec_detail show_top toolbar show_help about); -my @TRUSTED_USER = (@GUEST_USER, qw(at_timer_edit at_timer_new at_timer_save at_timer_test - at_timer_delete timer_new_form timer_add timer_delete timer_toggle rec_delete rec_rename rec_edit - config prog_switch rc_show rc_hitk grab_picture at_timer_toggle tv_show tv_switch - live_stream rec_stream force_update vdr_cmds)); + prog_summary rec_list rec_detail show_top toolbar show_help about); +my @TRUSTED_USER = ( + @GUEST_USER, qw(at_timer_edit at_timer_new at_timer_save at_timer_test + at_timer_delete timer_new_form timer_add timer_delete timer_toggle rec_delete rec_rename rec_edit + config prog_switch rc_show rc_hitk grab_picture at_timer_toggle tv_show tv_switch + live_stream rec_stream force_update vdr_cmds) +); my $MyStreamBase = "./vdradmin."; $MyURL = "./vdradmin.pl"; @@ -397,254 +418,256 @@ $MyURL = "./vdradmin.pl"; # Force Update at start UptoDate(1); -while(true) { - $Client = $Socket->accept(); - - # - if(!$Client) { - UptoDate(1); - next; - } - - my $peer = $Client->peerhost; - my @Request = ParseRequest($Client); - my $raw_request = $Request[0]; - - $ACCEPT_GZIP = 0; -# print("REQUEST: $raw_request\n"); - if($raw_request =~ /^GET (\/[\w\.\/-\:]*)([\?[\w=&\.\+\%-\:\!\@\~\#]*]*)[\#\d ]+HTTP\/1.\d$/) { - ($Request, $Query) = ($1, $2 ? substr($2, 1, length($2)) : undef); - } else { - Error("404", gettext("Not found"), gettext("The requested URL was not found on this server!")); - close($Client); - next; - } - - # parse header - my($username, $password, $http_useragent); - for my $line (@Request) { -# print(">" . $line . "\n"); - if($line =~ /Referer: (.*)/) { - $Referer = $1; - } - if($line =~ /Host: (.*)/) { - $HOST = $1; - } - if($line =~ /Authorization: basic (.*)/i) { - ($username, $password) = split(":", MIME::Base64::decode_base64($1), 2); - } - if($line =~ /User-Agent: (.*)/i) { - $http_useragent = $1; - } - if($line =~ /Accept-Encoding: (.*)/i) { - if($1 =~ /gzip/) { - $ACCEPT_GZIP = 1; - } - } - } - - # authenticate -# print("Username: $username / Password: $password\n"); - if(($CONFIG{USERNAME} eq $username && $CONFIG{PASSWORD} eq $password) || subnetcheck($peer,$CONFIG{LOCAL_NET}) ) { - $Guest = 0; - } elsif(($CONFIG{USERNAME_GUEST} eq $username && $CONFIG{PASSWORD_GUEST} eq $password) && $CONFIG{GUEST_ACCOUNT}) { - $Guest = 1; - } else { - headerNoAuth(); - close($Client); - next; - } - - - # serve request - $SVDRP = SVDRP->new; - my ($http_status, $bytes_transfered); - $MyURL = "." . $Request; - if($Request eq "/vdradmin.pl" || $Request eq "/vdradmin." . $CONFIG{TV_EXT} || $Request eq "/vdradmin." . $CONFIG{REC_EXT}) { - $q = CGI->new($Query); - my $aktion; - my ($real_aktion, $dummy) = split("#", $q->param("aktion"), 2); - if ($real_aktion eq "at_timer_aktion") { - $real_aktion = "at_timer_save"; - $real_aktion = "at_timer_delete" if ($q->param("at_delete")); - $real_aktion = "force_update" if ($q->param("at_force")); - $real_aktion = "at_timer_test" if ($q->param("test")); - } elsif ($real_aktion eq "timer_aktion") { - $real_aktion = "timer_delete" if ($q->param("timer_delete")); - $real_aktion = "timer_toggle" if ($q->param("timer_active") || $q->param("timer_inactive")); - } - - my @ALLOWED_FUNCTIONS; - $Guest ? (@ALLOWED_FUNCTIONS = @GUEST_USER) : (@ALLOWED_FUNCTIONS = @TRUSTED_USER); - - for(@ALLOWED_FUNCTIONS) { - ($aktion = $real_aktion) if($real_aktion eq $_); - } - if($aktion) { - eval("(\$http_status, \$bytes_transfered) = $aktion();"); - } else { - # XXX redirect to no access template - Error("403", gettext("Forbidden"), gettext("You don't have permission to access this function!")); - next; - } - } elsif($Request eq "/") { - $MyURL = "./vdradmin.pl"; - ($http_status, $bytes_transfered) = show_index(); - } elsif($Request eq "/navigation.html") { - ($http_status, $bytes_transfered) = show_navi(); - } else { - ($http_status, $bytes_transfered) = SendFile($Request); - } - Log(LOG_ACCESS, access_log($Client->peerhost, $username, time(), $raw_request, - $http_status, $bytes_transfered, $Request, $http_useragent)); - close($Client); - $SVDRP->close; +while (true) { + $Client = $Socket->accept(); + + # + if (!$Client) { + UptoDate(1); + next; + } + + my $peer = $Client->peerhost; + my @Request = ParseRequest($Client); + my $raw_request = $Request[0]; + + $ACCEPT_GZIP = 0; + + #print("REQUEST: $raw_request\n"); + if ($raw_request =~ /^GET (\/[\w\.\/-\:]*)([\?[\w=&\.\+\%-\:\!\@\~\#]*]*)[\#\d ]+HTTP\/1.\d$/) { + ($Request, $Query) = ($1, $2 ? substr($2, 1, length($2)) : undef); + } else { + Error("404", gettext("Not found"), gettext("The requested URL was not found on this server!")); + close($Client); + next; + } + + # parse header + my ($username, $password, $http_useragent); + for my $line (@Request) { + + #print(">" . $line . "\n"); + if ($line =~ /Referer: (.*)/) { + $Referer = $1; + } + if ($line =~ /Host: (.*)/) { + $HOST = $1; + } + if ($line =~ /Authorization: basic (.*)/i) { + ($username, $password) = split(":", MIME::Base64::decode_base64($1), 2); + } + if ($line =~ /User-Agent: (.*)/i) { + $http_useragent = $1; + } + if ($line =~ /Accept-Encoding: (.*)/i) { + if ($1 =~ /gzip/) { + $ACCEPT_GZIP = 1; + } + } + } + + # authenticate + #print("Username: $username / Password: $password\n"); + if (($CONFIG{USERNAME} eq $username && $CONFIG{PASSWORD} eq $password) || subnetcheck($peer, $CONFIG{LOCAL_NET})) { + $Guest = 0; + } elsif (($CONFIG{USERNAME_GUEST} eq $username && $CONFIG{PASSWORD_GUEST} eq $password) && $CONFIG{GUEST_ACCOUNT}) { + $Guest = 1; + } else { + headerNoAuth(); + close($Client); + next; + } + + # serve request + $SVDRP = SVDRP->new; + my ($http_status, $bytes_transfered); + $MyURL = "." . $Request; + if ($Request eq "/vdradmin.pl" || $Request eq "/vdradmin." . $CONFIG{TV_EXT} || $Request eq "/vdradmin." . $CONFIG{REC_EXT}) { + $q = CGI->new($Query); + my $aktion; + my ($real_aktion, $dummy) = split("#", $q->param("aktion"), 2); + if ($real_aktion eq "at_timer_aktion") { + $real_aktion = "at_timer_save"; + $real_aktion = "at_timer_delete" if ($q->param("at_delete")); + $real_aktion = "force_update" if ($q->param("at_force")); + $real_aktion = "at_timer_test" if ($q->param("test")); + } elsif ($real_aktion eq "timer_aktion") { + $real_aktion = "timer_delete" if ($q->param("timer_delete")); + $real_aktion = "timer_toggle" if ($q->param("timer_active") || $q->param("timer_inactive")); + } + + my @ALLOWED_FUNCTIONS; + $Guest ? (@ALLOWED_FUNCTIONS = @GUEST_USER) : (@ALLOWED_FUNCTIONS = @TRUSTED_USER); + + for (@ALLOWED_FUNCTIONS) { + ($aktion = $real_aktion) if ($real_aktion eq $_); + } + if ($aktion) { + eval("(\$http_status, \$bytes_transfered) = $aktion();"); + } else { + + # XXX redirect to no access template + Error("403", gettext("Forbidden"), gettext("You don't have permission to access this function!")); + next; + } + } elsif ($Request eq "/") { + $MyURL = "./vdradmin.pl"; + ($http_status, $bytes_transfered) = show_index(); + } elsif ($Request eq "/navigation.html") { + ($http_status, $bytes_transfered) = show_navi(); + } else { + ($http_status, $bytes_transfered) = SendFile($Request); + } + Log(LOG_ACCESS, access_log($Client->peerhost, $username, time(), $raw_request, $http_status, $bytes_transfered, $Request, $http_useragent)); + close($Client); + $SVDRP->close; } ############################################################################# ############################################################################# -sub GetChannelDesc { #TODO: unused - my(%hash); - for(@CHAN) { - $hash{$_->{id}} = $_->{name}; - } - return(%hash); +sub GetChannelDesc { #TODO: unused + my (%hash); + for (@CHAN) { + $hash{ $_->{id} } = $_->{name}; + } + return (%hash); } sub GetChannelDescByNumber { - my $vdr_id = shift; + my $vdr_id = shift; - if($vdr_id) { - for(@CHAN) { - if($_->{vdr_id} == $vdr_id) { - return($_->{name}); - } - } - } else { return(0); } + if ($vdr_id) { + for (@CHAN) { + if ($_->{vdr_id} == $vdr_id) { + return ($_->{name}); + } + } + } else { + return (0); + } } sub include { - my $file = shift; - if($file) { - eval(ReadFile($file)); - } + my $file = shift; + if ($file) { + eval(ReadFile($file)); + } } sub ReadFile { - my $file = shift; - return if(!$file); + my $file = shift; + return if (!$file); - open(I18N, $file) || HTMLError(sprintf($ERROR_MESSAGE{cant_open}, $file)); - my $buf = join("", <I18N>); - close(I18N); - return($buf); + open(I18N, $file) || HTMLError(sprintf($ERROR_MESSAGE{cant_open}, $file)); + my $buf = join("", <I18N>); + close(I18N); + return ($buf); } -sub GetChannelID { #TODO: unused - my($sid) = $_[0]; - for(@CHAN) { - if($_->{id} == $sid) { - return($_->{number}); +sub GetChannelID { #TODO: unused + my ($sid) = $_[0]; + for (@CHAN) { + if ($_->{id} == $sid) { + return ($_->{number}); + } } - } } -sub EURL { #TODO: unused - my($text) = @_; - $text =~ s/([^0-9a-zA-Z])/sprintf("%%%2.2x", ord($1))/ge; - return($text); +sub EURL { #TODO: unused + my ($text) = @_; + $text =~ s/([^0-9a-zA-Z])/sprintf("%%%2.2x", ord($1))/ge; + return ($text); } sub HTMLError { - my $error = join("", @_); - $CONFIG{CACHE_LASTUPDATE} = 0; - my $template = TemplateNew("error.html"); - my $vars = { - error => $error - }; - $template->param($vars); - my $output; - my $out = $template->output; - $Xtemplate->process(\$out, $vars, \$output) || return(header("500", "text/html", $Xtemplate->error())); - return(header("200", "text/html", $output)); -} - - -sub FillInZero { #TODO: unused - my($str, $length) = @_; - while(length($str) < $length) { - $str = "0$str"; - } - return($str); + my $error = join("", @_); + $CONFIG{CACHE_LASTUPDATE} = 0; + my $template = TemplateNew("error.html"); + my $vars = { error => $error }; + $template->param($vars); + my $output; + my $out = $template->output; + $Xtemplate->process(\$out, $vars, \$output) || return (header("500", "text/html", $Xtemplate->error())); + return (header("200", "text/html", $output)); +} + +sub FillInZero { #TODO: unused + my ($str, $length) = @_; + while (length($str) < $length) { + $str = "0$str"; + } + return ($str); } sub MHz { - my $frequency = shift; - while($frequency > 20000) { - $frequency /= 1000; - } - return(int($frequency)); + my $frequency = shift; + while ($frequency > 20000) { + $frequency /= 1000; + } + return (int($frequency)); } sub ChanTree { - undef(@CHAN); - $SVDRP->command("lstc"); - while($_ = $SVDRP->readoneline) { - chomp; - my($vdr_id, $temp) = split(/ /, $_, 2); - my($name, $frequency, $polarization, $source, $symbolrate, $vpid, $apid, - $tpid, $ca, $service_id, $nid, $tid, $rid) = split(/\:/, $temp); - $name =~ /(^[^,;]*).*/; #TODO? - $name = $1; - push(@CHAN, { - vdr_id => $vdr_id, - name => $name, - frequency => MHz($frequency), - polarization => $polarization, - source => $source, - symbolrate => $symbolrate, - vpid => $vpid, - apid => $apid, - tpid => $tpid, - ca => $ca, - service_id => $service_id, - nid => $nid, - tid => $tid, - rid => $rid - }); - } + undef(@CHAN); + $SVDRP->command("lstc"); + while ($_ = $SVDRP->readoneline) { + chomp; + my ($vdr_id, $temp) = split(/ /, $_, 2); + my ($name, $frequency, $polarization, $source, $symbolrate, $vpid, $apid, $tpid, $ca, $service_id, $nid, $tid, $rid) = split(/\:/, $temp); + $name =~ /(^[^,;]*).*/; #TODO? + $name = $1; + push(@CHAN, + { vdr_id => $vdr_id, + name => $name, + frequency => MHz($frequency), + polarization => $polarization, + source => $source, + symbolrate => $symbolrate, + vpid => $vpid, + apid => $apid, + tpid => $tpid, + ca => $ca, + service_id => $service_id, + nid => $nid, + tid => $tid, + rid => $rid + } + ); + } } sub get_vdrid_from_channelid { - my $channel_id = shift; - if($channel_id =~ /^(\d*)$/) { # vdr 1.0.x & >= vdr 1.1.15 - for my $channel (@CHAN) { - if($channel->{service_id} == $1) { - return($channel->{vdr_id}); - } - } - } elsif($channel_id =~ /^(.*)-(.*)-(.*)-(.*)-(.*)$/) { - for my $channel (@CHAN) { - if($channel->{source} eq $1 && - $channel->{nid} == $2 && - ($channel->{nid} ? $channel->{tid} : $channel->{frequency}) == $3 && - $channel->{service_id} == $4 && - $channel->{rid} == $5) { - return($channel->{vdr_id}); - } - } - } elsif($channel_id =~ /^(.*)-(.*)-(.*)-(.*)$/) { - for my $channel (@CHAN) { - if($channel->{source} eq $1 && - $channel->{nid} == $2 && - ($channel->{nid} || $channel->{tid} ? $channel->{tid} : $channel->{frequency}) == $3 && - $channel->{service_id} == $4) { - return($channel->{vdr_id}); - } - } - } else { - print "Can't find channel_id $channel_id\n"; - } + my $channel_id = shift; + if ($channel_id =~ /^(\d*)$/) { # vdr 1.0.x & >= vdr 1.1.15 + for my $channel (@CHAN) { + if ($channel->{service_id} == $1) { + return ($channel->{vdr_id}); + } + } + } elsif ($channel_id =~ /^(.*)-(.*)-(.*)-(.*)-(.*)$/) { + for my $channel (@CHAN) { + if ( $channel->{source} eq $1 + && $channel->{nid} == $2 + && ($channel->{nid} ? $channel->{tid} : $channel->{frequency}) == $3 + && $channel->{service_id} == $4 + && $channel->{rid} == $5) + { + return ($channel->{vdr_id}); + } + } + } elsif ($channel_id =~ /^(.*)-(.*)-(.*)-(.*)$/) { + for my $channel (@CHAN) { + if ( $channel->{source} eq $1 + && $channel->{nid} == $2 + && ($channel->{nid} || $channel->{tid} ? $channel->{tid} : $channel->{frequency}) == $3 + && $channel->{service_id} == $4) + { + return ($channel->{vdr_id}); + } + } + } else { + print "Can't find channel_id $channel_id\n"; + } } # @@ -653,50 +676,56 @@ sub get_vdrid_from_channelid { # Use at your own risk... tvr@iki.fi # sub get_channelid_from_vdrid { - my $vdr_id = shift; - if($vdr_id) { - my @C = grep($_->{vdr_id} == $vdr_id, @CHAN); - if(scalar(@C) == 1) { - my $ch = $C[0]; - return $ch->{source} . "-" . $ch->{nid} . "-" . ($ch->{nid}||$ch->{tid}?$ch->{tid}:$ch->{frequency}) . "-" . $ch->{service_id}; + my $vdr_id = shift; + if ($vdr_id) { + my @C = grep($_->{vdr_id} == $vdr_id, @CHAN); + if (scalar(@C) == 1) { + my $ch = $C[0]; + return $ch->{source} . "-" . $ch->{nid} . "-" . ($ch->{nid} || $ch->{tid} ? $ch->{tid} : $ch->{frequency}) . "-" . $ch->{service_id}; + } } - } } sub get_name_from_vdrid { - my $vdr_id = shift; - if($vdr_id) { - # Kanalliste nach identischer vdr_id durchsuchen - my @C = grep($_->{vdr_id} == $vdr_id, @CHAN); - # Es darf nach Spec nur eine Übereinstimmung geben - if(scalar(@C) == 1) { - return $C[0]->{name}; + my $vdr_id = shift; + if ($vdr_id) { + + # Kanalliste nach identischer vdr_id durchsuchen + my @C = grep($_->{vdr_id} == $vdr_id, @CHAN); + + # Es darf nach Spec nur eine Übereinstimmung geben + if (scalar(@C) == 1) { + return $C[0]->{name}; + } } - } } sub get_transponder_from_vdrid { - my $vdr_id = shift; - if($vdr_id) { - # Kanalliste nach identischer vdr_id durchsuchen - my @C = grep($_->{vdr_id} == $vdr_id, @CHAN); - # Es darf nach Spec nur eine Übereinstimmung geben - if(scalar(@C) == 1) { - return("$C[0]->{source}-$C[0]->{frequency}-$C[0]->{polarization}"); + my $vdr_id = shift; + if ($vdr_id) { + + # Kanalliste nach identischer vdr_id durchsuchen + my @C = grep($_->{vdr_id} == $vdr_id, @CHAN); + + # Es darf nach Spec nur eine Übereinstimmung geben + if (scalar(@C) == 1) { + return ("$C[0]->{source}-$C[0]->{frequency}-$C[0]->{polarization}"); + } } - } } sub get_ca_from_vdrid { - my $vdr_id = shift; - if($vdr_id) { - # Kanalliste nach identischer vdr_id durchsuchen - my @C = grep($_->{vdr_id} == $vdr_id, @CHAN); - # Es darf nach Spec nur eine Übereinstimmung geben - if(scalar(@C) == 1) { - return($C[0]->{ca}); + my $vdr_id = shift; + if ($vdr_id) { + + # Kanalliste nach identischer vdr_id durchsuchen + my @C = grep($_->{vdr_id} == $vdr_id, @CHAN); + + # Es darf nach Spec nur eine Übereinstimmung geben + if (scalar(@C) == 1) { + return ($C[0]->{ca}); + } } - } } ############################################################################# @@ -704,425 +733,421 @@ sub get_ca_from_vdrid { ############################################################################# sub EPG_getEntry { - my $vdr_id = shift; - my $epg_id = shift; - if($vdr_id && $epg_id) { - for(@{$EPG{$vdr_id}}) { - #if($_->{id} == $epg_id) { - if($_->{event_id} == $epg_id) { - return($_); - } - } - } -} - -sub getNumberOfElements { #TODO: unused - my $ref = shift; - if($ref) { - return(@{$ref}); - } else { - return(0); - } + my $vdr_id = shift; + my $epg_id = shift; + if ($vdr_id && $epg_id) { + for (@{ $EPG{$vdr_id} }) { + + #if($_->{id} == $epg_id) { + if ($_->{event_id} == $epg_id) { + return ($_); + } + } + } +} + +sub getNumberOfElements { #TODO: unused + my $ref = shift; + if ($ref) { + return (@{$ref}); + } else { + return (0); + } } sub getElement { - my $ref = shift; - my $index = shift; - if($ref) { - return($ref->[$index]); - } else { - return; - } + my $ref = shift; + my $index = shift; + if ($ref) { + return ($ref->[$index]); + } else { + return; + } } sub EPG_buildTree { - $SVDRP->command("lste"); - my($i, @events); - my($id, $bc) = (1, 0); - $low_time = time; - undef(%EPG); - while($_ = $SVDRP->readoneline) { - chomp; - if(/^C ([^ ]+) *(.*)/) { - undef(@events); - my($channel_id, $channel_name) = ($1, $2); - my $vdr_id = get_vdrid_from_channelid($channel_id); - if($CONFIG{EPG_PRUNE}>0 && $vdr_id > $CONFIG{EPG_PRUNE}) { - # diesen channel nicht einlesen - while($_ = $SVDRP->readoneline) { - last if(/^c/) - } - } - else { - $bc++; - while($_ = $SVDRP->readoneline) { - if(/^E/) { - my($garbish, $event_id, $time, $duration) = split(/[ \t]+/); - my($title, $subtitle, $summary); - while($_ = $SVDRP->readoneline) { -# if(/^T (.*)/) { $title = $1; $title =~ s/\|/<br \/>/sig } -# if(/^S (.*)/) { $subtitle = $1; $subtitle =~ s/\|/<br \/>/sig } -# if(/^D (.*)/) { $summary = $1; $summary =~ s/\|/<br \/>/sig } - if(/^T (.*)/) { $title = $1; } - if(/^S (.*)/) { $subtitle = $1; } - if(/^D (.*)/) { $summary = $1; } - if(/^e/) { - # - $low_time = $time if($time < $low_time); - push(@events, { - channel_name => $channel_name, - start => $time, - stop => $time + $duration, - duration => $duration, - title => $title, - subtitle => $subtitle, - summary => $summary, - id => $id, - vdr_id => $vdr_id, - event_id => $event_id - }); - $id++; - last; - } - } - } elsif(/^c/) { - my($last) = 0; - my(@temp); - for(sort({ $a->{start} <=> $b->{start} } @events)) { - next if($last == $_->{start}); - push(@temp, $_); - $last = $_->{start}; - } - $EPG{$vdr_id} = [ @temp ]; - last; - } - } - } - } - } - Log(LOG_STATS, "EPGTree: $id events, $bc broadcasters (lowtime $low_time)"); + $SVDRP->command("lste"); + my ($i, @events); + my ($id, $bc) = (1, 0); + $low_time = time; + undef(%EPG); + while ($_ = $SVDRP->readoneline) { + chomp; + if (/^C ([^ ]+) *(.*)/) { + undef(@events); + my ($channel_id, $channel_name) = ($1, $2); + my $vdr_id = get_vdrid_from_channelid($channel_id); + if ($CONFIG{EPG_PRUNE} > 0 && $vdr_id > $CONFIG{EPG_PRUNE}) { + + # diesen channel nicht einlesen + while ($_ = $SVDRP->readoneline) { + last if (/^c/); + } + } else { + $bc++; + while ($_ = $SVDRP->readoneline) { + if (/^E/) { + my ($garbish, $event_id, $time, $duration) = split(/[ \t]+/); + my ($title, $subtitle, $summary); + while ($_ = $SVDRP->readoneline) { + # if(/^T (.*)/) { $title = $1; $title =~ s/\|/<br \/>/sig } + # if(/^S (.*)/) { $subtitle = $1; $subtitle =~ s/\|/<br \/>/sig } + # if(/^D (.*)/) { $summary = $1; $summary =~ s/\|/<br \/>/sig } + if (/^T (.*)/) { $title = $1; } + if (/^S (.*)/) { $subtitle = $1; } + if (/^D (.*)/) { $summary = $1; } + if (/^e/) { + + # + $low_time = $time if ($time < $low_time); + push(@events, + { channel_name => $channel_name, + start => $time, + stop => $time + $duration, + duration => $duration, + title => $title, + subtitle => $subtitle, + summary => $summary, + id => $id, + vdr_id => $vdr_id, + event_id => $event_id + } + ); + $id++; + last; + } + } + } elsif (/^c/) { + my ($last) = 0; + my (@temp); + for (sort({ $a->{start} <=> $b->{start} } @events)) { + next if ($last == $_->{start}); + push(@temp, $_); + $last = $_->{start}; + } + $EPG{$vdr_id} = [@temp]; + last; + } + } + } + } + } + Log(LOG_STATS, "EPGTree: $id events, $bc broadcasters (lowtime $low_time)"); } - ############################################################################# # Socket functions ############################################################################# sub PrintToClient { - my $string = join("", @_); - return if(!defined($string)); - print($Client $string) if($Client && $Client->connected()); + my $string = join("", @_); + return if (!defined($string)); + print($Client $string) if ($Client && $Client->connected()); } sub ParseRequest { - my $Socket = shift; - my (@Request, $Line); - do { - $Line = <$Socket>; - $Line =~ s/\r\n//g; - push(@Request, $Line); - } while($Line); - return(@Request); + my $Socket = shift; + my (@Request, $Line); + do { + $Line = <$Socket>; + $Line =~ s/\r\n//g; + push(@Request, $Line); + } while ($Line); + return (@Request); } sub CloseSocket { - $SVDRP->close() if(defined $SVDRP); + $SVDRP->close() if (defined $SVDRP); } sub OpenSocket { - $SVDRP = SVDRP->new; + $SVDRP = SVDRP->new; } sub SendCMD { - my $cmd = join("", @_); + my $cmd = join("", @_); - if (($VDRVERSION < 10336) && (length($cmd) > $VDR_MAX_SVDRP_LENGTH)) { - Log(LOG_FATALERROR, "SendCMD(): command is too long(" . length($cmd) . "): " . substr($cmd, 0, 10)); - return; - } + if (($VDRVERSION < 10336) && (length($cmd) > $VDR_MAX_SVDRP_LENGTH)) { + Log(LOG_FATALERROR, "SendCMD(): command is too long(" . length($cmd) . "): " . substr($cmd, 0, 10)); + return; + } - OpenSocket() if(!$SVDRP); + OpenSocket() if (!$SVDRP); - my @output; - $SVDRP->command($cmd); - while($_ = $SVDRP->readoneline) { - push(@output, $_); - } - return(@output); + my @output; + $SVDRP->command($cmd); + while ($_ = $SVDRP->readoneline) { + push(@output, $_); + } + return (@output); } -sub mygmtime() { #TODO: unused - gmtime; +sub mygmtime() { #TODO: unused + gmtime; } sub headerTime { - my $time = shift; - $time = time() if(!$time); - my @weekdays = ("Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"); - my @months = ("Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"); - - return( - sprintf("%s, %s %s %s %02d:%02d:%02d GMT", - $weekdays[my_strfgmtime("%w", $time)], - my_strfgmtime("%d", $time), - $months[my_strfgmtime("%m", $time) - 1], - my_strfgmtime("%Y", $time), - my_strfgmtime("%H", $time), - my_strfgmtime("%M", $time), - my_strfgmtime("%S", $time) - ) - ); + my $time = shift; + $time = time() if (!$time); + my @weekdays = ("Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"); + my @months = ("Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"); + + return (sprintf("%s, %s %s %s %02d:%02d:%02d GMT", $weekdays[ my_strfgmtime("%w", $time) ], my_strfgmtime("%d", $time), $months[ my_strfgmtime("%m", $time) - 1 ], my_strfgmtime("%Y", $time), my_strfgmtime("%H", $time), my_strfgmtime("%M", $time), my_strfgmtime("%S", $time))); } sub GZip { - my $content = shift; - my $filename = new File::Temp("vdradmin-XXXXX", UNLINK => 1); - open(PIPE, "| gzip -9 - > $filename") || die "Can't open pipe to gzip ($!)"; - print PIPE $$content; - close(PIPE); - - open(FILE, $filename) || die "Can't open $filename ($!)"; - my $result = join("", <FILE>); - close(FILE); - - unlink($filename); - - #my $pid = open2(*RDFH, *WTFH, "gzip -1 -c -"); - #print "Write\n"; - #print WTFH $$content; - #print "Done\n"; - #close(WTFH); - #my $result = join("", <RDFH>); - #close(RDFH); - #waitpid($pid, 0); - - return($result); + my $content = shift; + my $filename = new File::Temp("vdradmin-XXXXX", UNLINK => 1); + open(PIPE, "| gzip -9 - > $filename") || die "Can't open pipe to gzip ($!)"; + print PIPE $$content; + close(PIPE); + + open(FILE, $filename) || die "Can't open $filename ($!)"; + my $result = join("", <FILE>); + close(FILE); + + unlink($filename); + + #my $pid = open2(*RDFH, *WTFH, "gzip -1 -c -"); + #print "Write\n"; + #print WTFH $$content; + #print "Done\n"; + #close(WTFH); + #my $result = join("", <RDFH>); + #close(RDFH); + #waitpid($pid, 0); + + return ($result); } sub LibGZip { - my $content = shift; - return(Compress::Zlib::memGzip($$content)); + my $content = shift; + return (Compress::Zlib::memGzip($$content)); } sub header { - my($status, $ContentType, $data, $caching) = @_; - Log(LOG_STATS, "Template Error: ".$Xtemplate->error()) - if($status >= 500); - if($ACCEPT_GZIP && $CONFIG{MOD_GZIP}) { - if($USE_SHELL_GZIP) { - $data = GZip(\$data); - } else { - $data = LibGZip(\$data); - } - } - - my $status_text = " OK" if($status eq "200"); - - PrintToClient("HTTP/1.0 $status$status_text", CRLF); - PrintToClient("Date: ", headerTime(), CRLF); - if(!$caching || $ContentType =~ /text\/html/) { - PrintToClient("Cache-Control: max-age=0", CRLF); - PrintToClient("Cache-Control: private", CRLF); - PrintToClient("Pragma: no-cache", CRLF); - PrintToClient("Expires: Thu, 01 Jan 1970 00:00:00 GMT", CRLF); - } else { - PrintToClient("Expires: ", headerTime(time() + 3600), CRLF); - PrintToClient("Cache-Control: max-age=3600", CRLF); - } - PrintToClient("Server: $SERVERVERSION", CRLF); - PrintToClient("Content-Length: ", length($data), CRLF) if($data); - PrintToClient("Connection: close", CRLF); - PrintToClient("Content-encoding: gzip", CRLF) if($CONFIG{MOD_GZIP} && $ACCEPT_GZIP); - PrintToClient("Content-type: $ContentType", CRLF, CRLF) if($ContentType); - PrintToClient($data) if($data); - return($status, length($data)); + my ($status, $ContentType, $data, $caching) = @_; + Log(LOG_STATS, "Template Error: " . $Xtemplate->error()) + if ($status >= 500); + if ($ACCEPT_GZIP && $CONFIG{MOD_GZIP}) { + if ($USE_SHELL_GZIP) { + $data = GZip(\$data); + } else { + $data = LibGZip(\$data); + } + } + + my $status_text = " OK" if ($status eq "200"); + + PrintToClient("HTTP/1.0 $status$status_text", CRLF); + PrintToClient("Date: ", headerTime(), CRLF); + if (!$caching || $ContentType =~ /text\/html/) { + PrintToClient("Cache-Control: max-age=0", CRLF); + PrintToClient("Cache-Control: private", CRLF); + PrintToClient("Pragma: no-cache", CRLF); + PrintToClient("Expires: Thu, 01 Jan 1970 00:00:00 GMT", CRLF); + } else { + PrintToClient("Expires: ", headerTime(time() + 3600), CRLF); + PrintToClient("Cache-Control: max-age=3600", CRLF); + } + PrintToClient("Server: $SERVERVERSION", CRLF); + PrintToClient("Content-Length: ", length($data), CRLF) if ($data); + PrintToClient("Connection: close", CRLF); + PrintToClient("Content-encoding: gzip", CRLF) if ($CONFIG{MOD_GZIP} && $ACCEPT_GZIP); + PrintToClient("Content-type: $ContentType", CRLF, CRLF) if ($ContentType); + PrintToClient($data) if ($data); + return ($status, length($data)); } sub headerForward { - my $url = shift; - PrintToClient("HTTP/1.0 302 Found", CRLF); - PrintToClient("Date: ", headerTime(), CRLF); - PrintToClient("Server: $SERVERVERSION", CRLF); - PrintToClient("Connection: close", CRLF); - PrintToClient("Location: $url", CRLF); - PrintToClient("Content-type: text/html", CRLF, CRLF); - return(302, 0); -} - -sub headerNoAuth { #TODO? - my $template = TemplateNew("noauth.html"); - my $vars; - my $data; - my $out = $template->output; - $Xtemplate->process(\$out, $vars, \$data); - PrintToClient("HTTP/1.0 401 Authorization Required", CRLF); - PrintToClient("Date: ", headerTime(), CRLF); - PrintToClient("Server: $SERVERVERSION", CRLF); - PrintToClient("WWW-Authenticate: Basic realm=\"vdradmind\"", CRLF); - PrintToClient("Content-Length: ", length($data), CRLF) if($data); - PrintToClient("Connection: close", CRLF); - PrintToClient("Content-type: text/html", CRLF, CRLF); - PrintToClient($data); - return(401, length($data)); + my $url = shift; + PrintToClient("HTTP/1.0 302 Found", CRLF); + PrintToClient("Date: ", headerTime(), CRLF); + PrintToClient("Server: $SERVERVERSION", CRLF); + PrintToClient("Connection: close", CRLF); + PrintToClient("Location: $url", CRLF); + PrintToClient("Content-type: text/html", CRLF, CRLF); + return (302, 0); +} + +sub headerNoAuth { #TODO? + my $template = TemplateNew("noauth.html"); + my $vars; + my $data; + my $out = $template->output; + $Xtemplate->process(\$out, $vars, \$data); + PrintToClient("HTTP/1.0 401 Authorization Required", CRLF); + PrintToClient("Date: ", headerTime(), CRLF); + PrintToClient("Server: $SERVERVERSION", CRLF); + PrintToClient("WWW-Authenticate: Basic realm=\"vdradmind\"", CRLF); + PrintToClient("Content-Length: ", length($data), CRLF) if ($data); + PrintToClient("Connection: close", CRLF); + PrintToClient("Content-type: text/html", CRLF, CRLF); + PrintToClient($data); + return (401, length($data)); } sub Error { - my $template = HTML::Template->new(filename => "$TEMPLATEDIR/$CONFIG{TEMPLATE}/noperm.html"); - $template->param( - title => $_[0] . " - " . $_[1], - h1 => $_[1], - error => $_[2], - ); - return(header("$_[0] $_[1]", "text/html", $template->output)); + my $template = HTML::Template->new(filename => "$TEMPLATEDIR/$CONFIG{TEMPLATE}/noperm.html"); + $template->param(title => $_[0] . " - " . $_[1], + h1 => $_[1], + error => $_[2], + ); + return (header("$_[0] $_[1]", "text/html", $template->output)); } sub SendFile { - my($File) = @_; - my($buf, $temp); - $File =~ s/^\///; - $File =~ s/^bilder/$CONFIG{SKIN}/i - if(defined $CONFIG{SKIN}); - my $FileWithPath = sprintf("%s/%s/%s", -# my $FileWithPath = sprintf("%s/%s/%s/%s", -# $BASENAME, - $TEMPLATEDIR, - $CONFIG{TEMPLATE}, - $File); - - # Skin css file - if($File eq "style.css" and -e sprintf('%s/%s/%s/%s', $TEMPLATEDIR, $CONFIG{TEMPLATE}, $CONFIG{SKIN}, $File)) { - $FileWithPath = sprintf('%s/%s/%s/%s', $TEMPLATEDIR, $CONFIG{TEMPLATE}, $CONFIG{SKIN}, $File); - } elsif($File eq "user.css" and -e "$USER_CSS") { - $FileWithPath = "$USER_CSS"; - } elsif($File =~ "^epg/" ) { - $File =~ s/^epg\///; - $FileWithPath = $CONFIG{EPGIMAGES} . "/" . $File; - } - - if(-e $FileWithPath) { - if(-r $FileWithPath) { - $buf = ReadFile($FileWithPath); - $temp = $File; - $temp =~ /([A-Za-z0-9]+)\.([A-Za-z0-9]+)/; - if(!$mimehash{$2}) { die("can't find mime-type \'$2\'\n"); } - return(header("200", $mimehash{$2}, $buf, 1)); + my ($File) = @_; + my ($buf, $temp); + $File =~ s/^\///; + $File =~ s/^bilder/$CONFIG{SKIN}/i + if (defined $CONFIG{SKIN}); + my $FileWithPath = sprintf( + "%s/%s/%s", + + #my $FileWithPath = sprintf("%s/%s/%s/%s", + #$BASENAME, + $TEMPLATEDIR, + $CONFIG{TEMPLATE}, + $File + ); + + # Skin css file + if ($File eq "style.css" and -e sprintf('%s/%s/%s/%s', $TEMPLATEDIR, $CONFIG{TEMPLATE}, $CONFIG{SKIN}, $File)) { + $FileWithPath = sprintf('%s/%s/%s/%s', $TEMPLATEDIR, $CONFIG{TEMPLATE}, $CONFIG{SKIN}, $File); + } elsif ($File eq "user.css" and -e "$USER_CSS") { + $FileWithPath = "$USER_CSS"; + } elsif ($File =~ "^epg/") { + $File =~ s/^epg\///; + $FileWithPath = $CONFIG{EPGIMAGES} . "/" . $File; + } + + if (-e $FileWithPath) { + if (-r $FileWithPath) { + $buf = ReadFile($FileWithPath); + $temp = $File; + $temp =~ /([A-Za-z0-9]+)\.([A-Za-z0-9]+)/; + if (!$mimehash{$2}) { die("can't find mime-type \'$2\'\n"); } + return (header("200", $mimehash{$2}, $buf, 1)); + } else { + print("File not found: $File\n"); + Error("403", gettext("Forbidden"), sprintf(gettext("Access to file \"%s\" denied!"), $File)); + } } else { - print("File not found: $File\n"); - Error("403", gettext("Forbidden"), sprintf(gettext("Access to file \"%s\" denied!"), $File)); + print("File not found: $File\n"); + Error("404", gettext("Not found"), sprintf(gettext("The URL \"%s\" was not found on this server!"), $File)); } - } else { - print("File not found: $File\n"); - Error("404", gettext("Not found"), sprintf(gettext("The URL \"%s\" was not found on this server!"), $File)); - } } ############################################################################# # autotimer functions ############################################################################# sub can_do_eventid_autotimer { - # check if we may use Event-IDs in general or not - return 0 if($CONFIG{NO_EVENTID} == 1); - my $vdr_id = shift; - # check if the current channel is on the Event-ID-blacklist - for my $n (split(",", $CONFIG{NO_EVENTID_ON})) { - return 0 if($n == $vdr_id); - } + # check if we may use Event-IDs in general or not + return 0 if ($CONFIG{NO_EVENTID} == 1); + + my $vdr_id = shift; - return 1; + # check if the current channel is on the Event-ID-blacklist + for my $n (split(",", $CONFIG{NO_EVENTID_ON})) { + return 0 if ($n == $vdr_id); + } + + return 1; } sub AT_Read { - my(@at); - if(-e $AT_FILENAME) { - open(AT_FILE, $AT_FILENAME) || HTMLError(sprintf($ERROR_MESSAGE{cant_open}, $AT_FILENAME)); - while(<AT_FILE>) { - chomp; - next if($_ eq ""); - my($active, $pattern, $section, $start, $stop, $episode, $prio, $lft, $channel, $directory, $done, $weekday) = split(/\:/, $_); - $pattern =~ s/\|/\:/g; - $pattern =~ s/\\:/\|/g; - $directory =~ s/\|/\:/g; - my($usechannel) = ($channel =~ /^\d+$/) ? $channel : get_vdrid_from_channelid($channel); - push(@at, { - active => $active, - pattern => $pattern, - section => $section, - start => $start, - stop => $stop, - episode => $episode, - prio => $prio, - lft => $lft, - channel => $usechannel, - directory => $directory, - done => $done, - # Be compatible with older formats, so search on weekdays default to yes - (weekdays => - {map {$_->[0] => defined $weekday ? substr($weekday,$_->[1],1) : 1} - (['wday_mon',0],['wday_tue',1],['wday_wed',2],['wday_thu',3], ['wday_fri',4],['wday_sat',5],['wday_sun',6]) - } - ) - - }); + my (@at); + if (-e $AT_FILENAME) { + open(AT_FILE, $AT_FILENAME) || HTMLError(sprintf($ERROR_MESSAGE{cant_open}, $AT_FILENAME)); + while (<AT_FILE>) { + chomp; + next if ($_ eq ""); + my ($active, $pattern, $section, $start, $stop, $episode, $prio, $lft, $channel, $directory, $done, $weekday) = split(/\:/, $_); + $pattern =~ s/\|/\:/g; + $pattern =~ s/\\:/\|/g; + $directory =~ s/\|/\:/g; + my ($usechannel) = ($channel =~ /^\d+$/) ? $channel : get_vdrid_from_channelid($channel); + push( + @at, + { active => $active, + pattern => $pattern, + section => $section, + start => $start, + stop => $stop, + episode => $episode, + prio => $prio, + lft => $lft, + channel => $usechannel, + directory => $directory, + done => $done, + + # Be compatible with older formats, so search on weekdays default to yes + (weekdays => { map { $_->[0] => defined $weekday ? substr($weekday, $_->[1], 1) : 1 } ([ 'wday_mon', 0 ], [ 'wday_tue', 1 ], [ 'wday_wed', 2 ], [ 'wday_thu', 3 ], [ 'wday_fri', 4 ], [ 'wday_sat', 5 ], [ 'wday_sun', 6 ]) }) + + } + ); + } + close(AT_FILE); } - close(AT_FILE); - } - return(@at); + return (@at); } sub AT_Write { - my @at = @_; - open(AT_FILE, ">" . $AT_FILENAME) || HTMLError(sprintf($ERROR_MESSAGE{cant_open}, $AT_FILENAME)); - foreach my $auto_timer (@at) { - my $temp; - for my $item (qw(active pattern section start stop episode prio lft channel directory done)) { - my $tempitem = $auto_timer->{$item}; - if ($item eq 'channel') { - my $channelnumber = get_channelid_from_vdrid($tempitem); - if ($channelnumber) { - $tempitem = $channelnumber; - } - } elsif ($item eq 'pattern') { - $tempitem =~ s/\|/\\|/g; - $tempitem =~ s/\:/\|/g; - } else { - $auto_timer->{$item} =~ s/\:/\|/g; - } - if(length($temp) == 0) { - $temp = $tempitem; - } else { - $temp .= ":" . $tempitem; - } - } - # Create weekday string, starting with monday, 1=yes=search this day, e.g. 0011001 - my $search_weekday=''; - map {$search_weekday.=$auto_timer->{weekdays}->{$_}} (qw (wday_mon wday_tue wday_wed wday_thu wday_fri wday_sat wday_sun)); - $temp.=":$search_weekday"; - - # Finally write the auto timer entry - print AT_FILE $temp, "\n"; - } - close(AT_FILE); + my @at = @_; + open(AT_FILE, ">" . $AT_FILENAME) || HTMLError(sprintf($ERROR_MESSAGE{cant_open}, $AT_FILENAME)); + foreach my $auto_timer (@at) { + my $temp; + for my $item (qw(active pattern section start stop episode prio lft channel directory done)) { + my $tempitem = $auto_timer->{$item}; + if ($item eq 'channel') { + my $channelnumber = get_channelid_from_vdrid($tempitem); + if ($channelnumber) { + $tempitem = $channelnumber; + } + } elsif ($item eq 'pattern') { + $tempitem =~ s/\|/\\|/g; + $tempitem =~ s/\:/\|/g; + } else { + $auto_timer->{$item} =~ s/\:/\|/g; + } + if (length($temp) == 0) { + $temp = $tempitem; + } else { + $temp .= ":" . $tempitem; + } + } + + # Create weekday string, starting with monday, 1=yes=search this day, e.g. 0011001 + my $search_weekday = ''; + map { $search_weekday .= $auto_timer->{weekdays}->{$_} } (qw (wday_mon wday_tue wday_wed wday_thu wday_fri wday_sat wday_sun)); + $temp .= ":$search_weekday"; + + # Finally write the auto timer entry + print AT_FILE $temp, "\n"; + } + close(AT_FILE); } sub DONE_Write { my $done = shift || return; open(DONE_FILE, ">" . $DONE_FILENAME) || HTMLError(sprintf($ERROR_MESSAGE{cant_open}, $DONE_FILENAME)); - foreach my $n (sort keys %$done) { - printf DONE_FILE "%s::%d::%s\n", $n, $done->{$n}, scalar localtime($done->{$n}); - }; + foreach my $n (sort keys %$done) { + printf DONE_FILE "%s::%d::%s\n", $n, $done->{$n}, scalar localtime($done->{$n}); + } close(DONE_FILE); } sub DONE_Read { my $done; - if(-e $DONE_FILENAME) { + if (-e $DONE_FILENAME) { open(DONE_FILE, $DONE_FILENAME) || HTMLError(sprintf($ERROR_MESSAGE{cant_open}, $AT_FILENAME)); - while(<DONE_FILE>) { + while (<DONE_FILE>) { chomp; - next if($_ eq ""); + next if ($_ eq ""); my @line = split('\:\:', $_); - $done->{$line[0]} = $line[1]; + $done->{ $line[0] } = $line[1]; } close(DONE_FILE); } @@ -1131,11 +1156,11 @@ sub DONE_Read { sub BlackList_Read { my %blacklist; - if(-e $BL_FILENAME) { + if (-e $BL_FILENAME) { open(BL_FILE, $BL_FILENAME) || HTMLError(sprintf($ERROR_MESSAGE{cant_open}, $BL_FILENAME)); - while(<BL_FILE>) { + while (<BL_FILE>) { chomp; - next if($_ eq ""); + next if ($_ eq ""); $blacklist{$_} = 1; } close(BL_FILE); @@ -1143,3763 +1168,3753 @@ sub BlackList_Read { return %blacklist; } - sub AutoTimer { - return if(!$CONFIG{AT_FUNC}); - Log(LOG_AT, "Auto Timer: Scanning for events..."); - my($search, $start, $stop) = @_; - my @at_matches; - - my @at; - my $dry_run = shift; - if ($dry_run) { - @at = shift; - } else { - @at = AT_Read(); - } - - my $oneshots = 0; - $DONE = &DONE_Read unless($DONE); - my %blacklist = &BlackList_Read; - - # Merken der wanted Channels (geht schneller - # bevor das immer wieder in der unteren Schleife gemacht wird). - my $wanted; - for my $n ( split( ",", $CONFIG{CHANNELS_WANTED} ) ) { - $wanted->{$n} = 1; - } - - # Die Timerliste holen - #TODO: is this really needed? Timers will be checked in AT_ProgTimer... + return if (!$CONFIG{AT_FUNC}); + Log(LOG_AT, "Auto Timer: Scanning for events..."); + my ($search, $start, $stop) = @_; + my @at_matches; + + my @at; + my $dry_run = shift; + if ($dry_run) { + @at = shift; + } else { + @at = AT_Read(); + } + + my $oneshots = 0; + $DONE = &DONE_Read unless ($DONE); + my %blacklist = &BlackList_Read; + + # Merken der wanted Channels (geht schneller + # bevor das immer wieder in der unteren Schleife gemacht wird). + my $wanted; + for my $n (split(",", $CONFIG{CHANNELS_WANTED})) { + $wanted->{$n} = 1; + } + + # Die Timerliste holen + #TODO: is this really needed? Timers will be checked in AT_ProgTimer... # my $timer; # foreach my $t (ParseTimer(0)){ -# #TODO: what's the 2nd "%s" for? +##TODO: what's the 2nd "%s" for? # my $key = sprintf('%d:%s:%s', # $t->{vdr_id}, # $t->{title}, -# "" +# "" # ); # $timer->{$key} = $t; -# printf("Timer: %s / %s / %s\n", $key, $timer->{event_id}, $t); +#printf("Timer: %s / %s / %s\n", $key, $timer->{event_id}, $t); # } -# print("TIMER\n") if($timer); +#print("TIMER\n") if($timer); #/TODO - my $date_now = time(); - for my $sender (keys(%EPG)) { - for my $event (@{$EPG{$sender}}) { + my $date_now = time(); + for my $sender (keys(%EPG)) { + for my $event (@{ $EPG{$sender} }) { - # Event in the past? - next if($event->{stop} < $date_now); + # Event in the past? + next if ($event->{stop} < $date_now); - # Ein Timer der schon programmmiert wurde kann - # ignoriert werden - #TODO: $timer not initialized + # Ein Timer der schon programmmiert wurde kann + # ignoriert werden + #TODO: $timer not initialized # next if($event->{event_id} == $timer->{event_id}); - # Wenn CHANNELS_WANTED_AUTOTIMER dann next wenn der Kanal - # nicht in der WantedList steht - if($CONFIG{CHANNELS_WANTED_AUTOTIMER}) { - next unless defined $wanted->{ $event->{vdr_id} }; - } + # Wenn CHANNELS_WANTED_AUTOTIMER dann next wenn der Kanal + # nicht in der WantedList steht + if ($CONFIG{CHANNELS_WANTED_AUTOTIMER}) { + next unless defined $wanted->{ $event->{vdr_id} }; + } + # Hamwa schon gehabt? + my $DoneStr = sprintf('%s~%d~%s', $event->{title}, $event->{event_id}, ($event->{subtitle} ? $event->{subtitle} : ''),); - # Hamwa schon gehabt? - my $DoneStr = sprintf('%s~%d~%s', - $event->{title}, - $event->{event_id}, - ($event->{subtitle} ? $event->{subtitle} : ''), - ); - - if(exists $DONE->{$DoneStr}) { - Log(LOG_DEBUG, sprintf("Auto Timer: already done \"%s\"", $DoneStr)); - next; - } + if (exists $DONE->{$DoneStr}) { + Log(LOG_DEBUG, sprintf("Auto Timer: already done \"%s\"", $DoneStr)); + next; + } - if(%blacklist) { - # Wollen wir nicht haben. - my $BLStr = $event->{title}; - $BLStr .= "~" . $event->{subtitle} if $event->{subtitle}; + if (%blacklist) { - if($blacklist{$BLStr} eq 1 || $blacklist{$event->{title}} eq 1) { - Log(LOG_DEBUG, sprintf("Auto Timer: blacklisted \"%s\"", $event->{title})); - next; - } - } + # Wollen wir nicht haben. + my $BLStr = $event->{title}; + $BLStr .= "~" . $event->{subtitle} if $event->{subtitle}; - for my $at (@at) { - next if(!$at->{active} && !$dry_run); - next if(($at->{channel}) && ($at->{channel} != $event->{vdr_id})); -#print("AT: " . $at->{channel} . " - " . $at->{pattern} . " --- " . $event->{vdr_id} . " - " . $event->{title} . "\n"); + if ($blacklist{$BLStr} eq 1 || $blacklist{ $event->{title} } eq 1) { + Log(LOG_DEBUG, sprintf("Auto Timer: blacklisted \"%s\"", $event->{title})); + next; + } + } - my $SearchStr; - if($at->{section} & 1) { - $SearchStr = $event->{title}; - } - if(($at->{section} & 2) && defined($event->{subtitle})) { - $SearchStr .= "~" . $event->{subtitle}; - } - if($at->{section} & 4) { - $SearchStr .= "~" . $event->{summary}; - } + for my $at (@at) { + next if (!$at->{active} && !$dry_run); + next if (($at->{channel}) && ($at->{channel} != $event->{vdr_id})); + + #print("AT: " . $at->{channel} . " - " . $at->{pattern} . " --- " . $event->{vdr_id} . " - " . $event->{title} . "\n"); + + my $SearchStr; + if ($at->{section} & 1) { + $SearchStr = $event->{title}; + } + if (($at->{section} & 2) && defined($event->{subtitle})) { + $SearchStr .= "~" . $event->{subtitle}; + } + if ($at->{section} & 4) { + $SearchStr .= "~" . $event->{summary}; + } + + # Regular Expressions are surrounded by slashes -- everything else + # are search patterns + if ($at->{pattern} =~ /^\/(.*)\/(i?)$/) { + + # We have a RegExp + Log(LOG_DEBUG, sprintf("Auto Timer: Checking RegExp \"%s\"", $at->{pattern})); + + if ((!length($SearchStr)) || (!length($1))) { + Log(LOG_DEBUG, "No search string or regexp, skipping!"); + next; + } + + next if (!defined($1)); + + # Shall we search case insensitive? + if (($2 eq "i") && ($SearchStr !~ /$1/i)) { + next; + } elsif (($2 ne "i") && ($SearchStr !~ /$1/)) { + next; + } else { + Log(LOG_AT, sprintf("Auto Timer: RegExp \"%s\" matches \"%s\"", $at->{pattern}, $SearchStr)); + } + } else { + + # We have a search pattern + Log(LOG_DEBUG, sprintf("Auto Timer: Checking pattern \"%s\"", $at->{pattern})); + + # Escape special characters within the search pattern + my $atpattern = $at->{pattern}; + $atpattern =~ s/([\+\?\.\*\^\$\(\)\[\]\{\}\|\\])/\\$1/g; + + Log(LOG_DEBUG, sprintf("Auto Timer: Escaped pattern: \"%s\"", $atpattern)); + + if ((!length($SearchStr)) || (!length($atpattern))) { + Log(LOG_DEBUG, "No search string or pattern, skipping!"); + next; + } + + # split search pattern at spaces into single sub-patterns, and + # test for all of them (logical "and") + my $fp = 1; + for my $pattern (split(/ +/, $atpattern)) { + + # search for each sub-pattern, case insensitive + if ($SearchStr !~ /$pattern/i) { + $fp = 0; + } else { + Log(LOG_DEBUG, sprintf("Auto Timer: Found matching pattern: \"%s\"", $pattern)); + } + } + next if (!$fp); + } + + my $event_start = my_strftime("%H%M", $event->{start}); + my $event_stop = my_strftime("%H%M", $event->{stop}); + Log(LOG_DEBUG, sprintf("Auto Timer: Comparing pattern \"%s\" (%s - %s) with event \"%s\" (%s - %s)", $at->{pattern}, $at->{start}, $at->{stop}, $event->{title}, $event_start, $event_stop)); + + # Do we have a time slot? + if ($at->{start}) { # We have a start time and possibly a stop time for the auto timer + # Do we have Midnight between AT start and stop time? + if (($at->{stop}) && ($at->{stop} < $at->{start})) { + + # The AT includes Midnight + Log(LOG_DEBUG, "922: AT includes Midnight"); + + # Do we have Midnight between Event start and stop? + if ($event_stop < $event_start) { + + # The event includes Midnight + Log(LOG_DEBUG, "926: Event includes Midnight"); + if ($event_start < $at->{start}) { + Log(LOG_DEBUG, "924: Event starts before AT start"); + next; + } + if ($event_stop > $at->{stop}) { + Log(LOG_DEBUG, "932: Event ends after AT stop"); + next; + } + } else { + + # Normal event not spreading over Midnight + Log(LOG_DEBUG, "937: Event does not include Midnight"); + if ($event_start < $at->{start}) { + if ($event_start > $at->{stop}) { + + # The event starts before AT start and after AT stop + Log(LOG_DEBUG, "941: Event starts before AT start and after AT stop"); + next; + } + if ($event_stop > $at->{stop}) { + + # The event ends after AT stop + Log(LOG_DEBUG, "946: Event ends after AT stop"); + next; + } + } + } + } else { + + # Normal auto timer, not spreading over midnight + Log(LOG_DEBUG, "953: AT does not include Midnight"); + + # Is the event spreading over midnight? + if ($event_stop < $event_start) { + + # Event spreads midnight + if ($at->{stop}) { + + # We have a AT stop time defined before midnight -- no match + Log(LOG_DEBUG, "959: Event includes Midnight, Autotimer not"); + next; + } + } else { + + # We have a normal event, nothing special + # Event must not start before AT start + if ($event_start < $at->{start}) { + Log(LOG_DEBUG, "963: Event starts before AT start"); + next; + } + + # Event must not end after AT stop + if (($at->{stop}) && ($event_stop > $at->{stop})) { + Log(LOG_DEBUG, "968: Event ends after AT stop"); + next; + } + } + } + } else { + + # We have no AT start time + if ($at->{stop}) { + if ($event_stop > $at->{stop}) { + Log(LOG_DEBUG, "977: Only AT stop time, Event stops after AT stop"); + next; + } + } + } + + # Check if we should schedule any timers on this weekday + my %weekdays_map = (1 => 'wday_mon', 2 => 'wday_tue', 3 => 'wday_wed', 4 => 'wday_thu', 5 => 'wday_fri', 6 => 'wday_sat', 7 => 'wday_sun'); + unless ($at->{weekdays}->{ $weekdays_map{ my_strftime("%u", $event->{start}) } }) { + Log(LOG_DEBUG, "Event not valid for this weekday"); + next; + } + + Log(LOG_AT, sprintf("Auto Timer: Found \"%s\"", $at->{pattern})); + +######################################################################################### +# 20050130: patch by macfly: parse extended EPG information provided by tvm2vdr.pl +######################################################################################### + + my $title; + my $directory = $at->{directory}; + my %at_details; + + if ($directory) { + $directory =~ s#/#~#g; + } + + if ($directory && $directory =~ /\%.*\%/) { + $title = $directory; + $at_details{'title'} = $event->{title}; + $at_details{'subtitle'} = $event->{subtitle} ? $event->{subtitle} : my_strftime("%Y-%m-%d", $event->{start}); + $at_details{'date'} = my_strftime("%Y-%m-%d", $event->{start}); + $at_details{'regie'} = $1 if $event->{summary} =~ m/\|Director: (.*?)\|/; + $at_details{'category'} = $1 if $event->{summary} =~ m/\|Category: (.*?)\|/; + $at_details{'genre'} = $1 if $event->{summary} =~ m/\|Genre: (.*?)\|/; + $at_details{'year'} = $1 if $event->{summary} =~ m/\|Year: (.*?)\|/; + $at_details{'country'} = $1 if $event->{summary} =~ m/\|Country: (.*?)\|/; + $at_details{'originaltitle'} = $1 if $event->{summary} =~ m/\|Originaltitle: (.*?)\|/; + $at_details{'fsk'} = $1 if $event->{summary} =~ m/\|FSK: (.*?)\|/; + $at_details{'episode'} = $1 if $event->{summary} =~ m/\|Episode: (.*?)\|/; + $at_details{'rating'} = $1 if $event->{summary} =~ m/\|Rating: (.*?)\|/; + $title =~ s/%([\w_-]+)%/$at_details{lc($1)}/sieg; + + #$title .= "~" . $event->{title}; + } else { + $title = $event->{title}; + if ($directory) { + $title = $directory . "~" . $title; + } + if ($at->{episode}) { + if ($event->{subtitle}) { + $title .= "~" . $event->{subtitle}; + } else { + $title .= "~ "; + } + } + } + + # gemaess vdr.5 alle : durch | ersetzen. + $title =~ s#:#|#g; + + # sind irgendwelche Tags verwendet worden, die leer waren und die doppelte Verzeichnisse erzeugten? + $title =~ s#~+#~#g; + $title =~ s#^~##; + +######################################################################################### +# 20050130: patch by macfly: parse extended EPG information provided by tvm2vdr.pl +######################################################################################### - # Regular Expressions are surrounded by slashes -- everything else - # are search patterns - if($at->{pattern} =~ /^\/(.*)\/(i?)$/) { - # We have a RegExp - Log(LOG_DEBUG, sprintf("Auto Timer: Checking RegExp \"%s\"", $at->{pattern})); + if ($dry_run) { - if((! length($SearchStr)) || (! length($1))) { - Log(LOG_DEBUG, "No search string or regexp, skipping!"); - next; - } + #printf("AT found: (%s) (%s) (%s) (%s) (%s) (%s)\n", $event->{title}, $title, $event->{subtitle}, $directory, $event->{start}, $event->{stop}); + push(@at_matches, { otitle => $event->{title}, title => $title, subtitle => $event->{subtitle} ? $event->{subtitle} : "", directory => $directory, start => my_strftime("%H:%M", $event->{start}), stop => my_strftime("%H:%M", $event->{stop}), date => my_strftime("%A, %x", $event->{start}), channel => GetChannelDescByNumber($event->{vdr_id}) }); + } else { + Log(LOG_AT, sprintf("AutoTimer: Programming Timer \"%s\" (Event-ID %s, %s - %s)", $title, $event->{event_id}, strftime("%Y%m%d-%H%M", localtime($event->{start})), strftime("%Y%m%d-%H%M", localtime($event->{stop})))); - next if(!defined($1)); - # Shall we search case insensitive? - if(($2 eq "i") && ($SearchStr !~ /$1/i)) { - next; - } elsif(($2 ne "i") && ($SearchStr !~ /$1/)) { - next; - } else { - Log(LOG_AT, sprintf("Auto Timer: RegExp \"%s\" matches \"%s\"", $at->{pattern}, $SearchStr)); - } - } else { - # We have a search pattern - Log(LOG_DEBUG, sprintf("Auto Timer: Checking pattern \"%s\"", $at->{pattern})); + AT_ProgTimer(1, $event->{event_id}, $event->{vdr_id}, $event->{start}, $event->{stop}, $title, $event->{summary}, $at); + + if ($at->{active} == 2) { + Log(LOG_AT, sprintf("AutoTimer: Disabling one-shot Timer")); + $at->{active} = 0; + $oneshots = 1; + } + $DONE->{$DoneStr} = $event->{stop} if ($at->{done}); + } + } + } + } + if ($oneshots) { + Log(LOG_AT, sprintf("AutoTimer: saving because of one-shots triggered")); + AT_Write(@at); + } - # Escape special characters within the search pattern - my $atpattern = $at->{pattern}; - $atpattern =~ s/([\+\?\.\*\^\$\(\)\[\]\{\}\|\\])/\\$1/g; + Log(LOG_AT, "Auto Timer: Done."); + Log(LOG_AT, "Auto Timer: Purging done list... (lowtime $low_time)"); + for (keys %$DONE) { delete $DONE->{$_} if ($low_time > $DONE->{$_}) } + Log(LOG_AT, "Auto Timer: Save done list..."); + &DONE_Write($DONE) if ($DONE); + Log(LOG_AT, "Auto Timer: Done."); - Log(LOG_DEBUG, sprintf("Auto Timer: Escaped pattern: \"%s\"", $atpattern)); + if ($dry_run) { + return @at_matches; + } +} - if((! length($SearchStr)) || (! length($atpattern))) { - Log(LOG_DEBUG, "No search string or pattern, skipping!"); - next; - } - # split search pattern at spaces into single sub-patterns, and - # test for all of them (logical "and") - my $fp = 1; - for my $pattern (split(/ +/, $atpattern)) { - # search for each sub-pattern, case insensitive - if($SearchStr !~ /$pattern/i) { - $fp = 0; - } else { - Log(LOG_DEBUG, sprintf("Auto Timer: Found matching pattern: \"%s\"", $pattern)); +sub AT_ProgTimer { + my ($active, $event_id, $channel, $start, $stop, $title, $summary, $at) = @_; + + $start -= ($CONFIG{TM_MARGIN_BEGIN} * 60); + $stop += ($CONFIG{TM_MARGIN_END} * 60); + + my $start_fmt = my_strftime("%H%M", $start); + my $found = 0; + for (ParseTimer(1)) { + if ($_->{vdr_id} == $channel) { + if ($_->{autotimer} == 2 && $event_id && $_->{event_id}) { + if ($_->{event_id} == $event_id) { + $found = 1; + last; + } } - } - next if(!$fp); - } - - my $event_start = my_strftime("%H%M", $event->{start}); - my $event_stop = my_strftime("%H%M", $event->{stop}); - Log(LOG_DEBUG, sprintf("Auto Timer: Comparing pattern \"%s\" (%s - %s) with event \"%s\" (%s - %s)", $at->{pattern}, $at->{start}, $at->{stop}, $event->{title}, $event_start, $event_stop)); - # Do we have a time slot? - if($at->{start}) { # We have a start time and possibly a stop time for the auto timer - # Do we have Midnight between AT start and stop time? - if(($at->{stop}) && ($at->{stop} < $at->{start})) { - # The AT includes Midnight - Log(LOG_DEBUG, "922: AT includes Midnight"); - # Do we have Midnight between Event start and stop? - if($event_stop < $event_start) { - # The event includes Midnight - Log(LOG_DEBUG, "926: Event includes Midnight"); - if($event_start < $at->{start}) { - Log(LOG_DEBUG, "924: Event starts before AT start"); - next; - } - if($event_stop > $at->{stop}) { - Log(LOG_DEBUG, "932: Event ends after AT stop"); - next; - } - } else { - # Normal event not spreading over Midnight - Log(LOG_DEBUG, "937: Event does not include Midnight"); - if($event_start < $at->{start}) { - if($event_start > $at->{stop}) { - # The event starts before AT start and after AT stop - Log(LOG_DEBUG, "941: Event starts before AT start and after AT stop"); - next; - } - if($event_stop > $at->{stop}) { - # The event ends after AT stop - Log(LOG_DEBUG, "946: Event ends after AT stop"); - next; - } - } - } - } else { - # Normal auto timer, not spreading over midnight - Log(LOG_DEBUG, "953: AT does not include Midnight"); - # Is the event spreading over midnight? - if($event_stop < $event_start) { - # Event spreads midnight - if($at->{stop}) { - # We have a AT stop time defined before midnight -- no match - Log(LOG_DEBUG, "959: Event includes Midnight, Autotimer not"); - next; - } - } else { - # We have a normal event, nothing special - # Event must not start before AT start - if($event_start < $at->{start}) { - Log(LOG_DEBUG, "963: Event starts before AT start"); - next; - } - # Event must not end after AT stop - if(($at->{stop}) && ($event_stop > $at->{stop})) { - Log(LOG_DEBUG, "968: Event ends after AT stop"); - next; - } + + # event_ids didn't match, try matching using starting time + if ($_->{start} eq $start) { + $found = 1; + last; } - } - } else { - # We have no AT start time - if($at->{stop}) { - if($event_stop > $at->{stop}) { - Log(LOG_DEBUG, "977: Only AT stop time, Event stops after AT stop"); - next; + if ($start_fmt eq my_strftime("%H%M", $_->{start})) { + if ($VDRVERSION < 10323) { + if ($_->{dor} == my_strftime("%d", $start)) { + $found = 1; + last; + } + } else { + if ($_->{dor} eq my_strftime("%Y-%m-%d", $start)) { + $found = 1; + last; + } + } } - } } + } - # Check if we should schedule any timers on this weekday - my %weekdays_map = (1=>'wday_mon', 2=>'wday_tue', 3=>'wday_wed', 4=>'wday_thu', 5=>'wday_fri', 6=>'wday_sat', 7=>'wday_sun'); - unless ($at->{weekdays}->{$weekdays_map{my_strftime ("%u",$event->{start})}}) { - Log(LOG_DEBUG, "Event not valid for this weekday"); - next; - } + # we will only programm new timers, CheckTimers is responsible for + # updating existing timers + if (!$found) { + $title =~ s/\|/\:/g; - Log(LOG_AT, sprintf("Auto Timer: Found \"%s\"", $at->{pattern})); + my $autotimer = 2; + unless (can_do_eventid_autotimer($channel)) { + $event_id = 0; + $autotimer = 1; + } -######################################################################################### -# 20050130: patch by macfly: parse extended EPG information provided by tvm2vdr.pl -######################################################################################### - - my $title; - my $directory = $at->{directory}; - my %at_details; - - if($directory) { - $directory =~ s#/#~#g; - } - - if($directory && $directory =~ /\%.*\%/) { - $title = $directory; - $at_details{'title'} = $event->{title}; - $at_details{'subtitle'} = $event->{subtitle} ? $event->{subtitle} : my_strftime("%Y-%m-%d", $event->{start}); - $at_details{'date'} = my_strftime("%Y-%m-%d", $event->{start}); - $at_details{'regie'} = $1 if $event->{summary} =~ m/\|Director: (.*?)\|/; - $at_details{'category'} = $1 if $event->{summary} =~ m/\|Category: (.*?)\|/; - $at_details{'genre'} = $1 if $event->{summary} =~ m/\|Genre: (.*?)\|/; - $at_details{'year'} = $1 if $event->{summary} =~ m/\|Year: (.*?)\|/; - $at_details{'country'} = $1 if $event->{summary} =~ m/\|Country: (.*?)\|/; - $at_details{'originaltitle'} = $1 if $event->{summary} =~ m/\|Originaltitle: (.*?)\|/; - $at_details{'fsk'} = $1 if $event->{summary} =~ m/\|FSK: (.*?)\|/; - $at_details{'episode'} = $1 if $event->{summary} =~ m/\|Episode: (.*?)\|/; - $at_details{'rating'} = $1 if $event->{summary} =~ m/\|Rating: (.*?)\|/; - $title =~ s/%([\w_-]+)%/$at_details{lc($1)}/sieg; -# $title .= "~" . $event->{title}; - } else { - $title = $event->{title}; - if($directory) { - $title = $directory . "~" . $title; - } - if($at->{episode}) { - if($event->{subtitle}) { - $title .= "~" . $event->{subtitle}; - } else { - $title .= "~ "; - } - } - } - - - # gemaess vdr.5 alle : durch | ersetzen. - $title =~ s#:#|#g; - - # sind irgendwelche Tags verwendet worden, die leer waren und die doppelte Verzeichnisse erzeugten? - $title =~ s#~+#~#g; - $title =~ s#^~##; - -######################################################################################### -# 20050130: patch by macfly: parse extended EPG information provided by tvm2vdr.pl -######################################################################################### + Log(LOG_AT, sprintf("AT_ProgTimer: Programming Timer \"%s\" (Event-ID %s, %s - %s)", $title, $event_id, strftime("%Y%m%d-%H%M", localtime($start)), strftime("%Y%m%d-%H%M", localtime($stop)))); + ProgTimer(0, $active, $event_id, $channel, $start, $stop, $at->{prio} ? $at->{prio} : $CONFIG{AT_PRIORITY}, $at->{lft} ? $at->{lft} : $CONFIG{AT_LIFETIME}, $title, append_timer_metadata($VDRVERSION < 10344 ? $summary : undef, $event_id, $autotimer, $CONFIG{TM_MARGIN_BEGIN}, $CONFIG{TM_MARGIN_END}, $at->{pattern})); + if ($CONFIG{AT_SENDMAIL} == 1 && $can_use_net_smtp && ($CONFIG{MAIL_AUTH_USER} eq "" || $can_use_smtpauth)) { + my $sum = $summary; + + # remove all HTML-Tags from text + $sum =~ s/\<[^\>]+\>/ /g; + + # linefeeds + $sum =~ s/\|/\n/g; + my $dat = strftime("%A, %x", localtime($start)); + my $strt = strftime("%H:%M", localtime($start)); + my $end = strftime("%H:%M", localtime($stop)); + + eval { + local $SIG{__DIE__}; + + my $smtp = Net::SMTP->new($CONFIG{MAIL_SERVER}, Timeout => 30); + if ($smtp) { + if ($CONFIG{MAIL_AUTH_USER} ne "") { + $smtp->auth($CONFIG{MAIL_AUTH_USER}, $CONFIG{MAIL_AUTH_PASS}) || return; + } + $smtp->mail("$CONFIG{MAIL_FROM}"); + $smtp->to($CONFIG{MAIL_TO}); + $smtp->data(); + $smtp->datasend("To: $CONFIG{MAIL_TO}\n"); + my $qptitle = my_encode_qp($title); + $smtp->datasend("Subject: AUTOTIMER: New timer created for $qptitle\n"); + $smtp->datasend("From: VDRAdmin-AM AutoTimer <$CONFIG{MAIL_FROM}>\n"); + $smtp->datasend("MIME-Version: 1.0\n"); + $smtp->datasend("Content-Type: text/plain; charset=iso-8859-1\n"); + $smtp->datasend("Content-Transfer-Encoding: 8bit\n"); + $smtp->datasend("\n"); + $smtp->datasend("Created AUTOTIMER for $title\n"); + $smtp->datasend("===========================================================================\n\n"); + $smtp->datasend("Channel: $channel\n\n"); + $smtp->datasend("$title\n"); + $smtp->datasend("$dat, $strt - $end\n\n"); + $smtp->datasend("Summary:\n"); + $smtp->datasend("--------\n"); + $smtp->datasend("$sum\n"); + $smtp->dataend(); + $smtp->quit(); + } else { + print("SMTP failed! Please check your email settings.\n"); + Log(LOG_FATALERROR, "SMTP failed! Please check your email settings."); + } + }; + if ($@) { + print("Failed to send email!\nPlease contact the author.\n"); + Log(LOG_FATALERROR, "Failed to send email! Please contact the author."); + } + } elsif ($CONFIG{AT_SENDMAIL} == 1) { + print("Missing Perl module Net::SMTP.\nAutoTimer email notification disabled.\n"); + Log(LOG_FATALERROR, "Missing Perl module Net::SMTP. AutoTimer email notification disabled."); + if ($CONFIG{MAIL_AUTH_USER} ne "" && !$can_use_smtpauth) { + print("Missing Perl module Authen::SASL and/or Digest::HMAC_MD5.\nAutoTimer email notification disabled.\n"); + Log(LOG_FATALERROR, "Missing Perl module Authen::SASL and/or Digest::HMAC_MD5. AutoTimer email notification disabled."); + } + } + } +} - if ($dry_run) { -# printf("AT found: (%s) (%s) (%s) (%s) (%s) (%s)\n", $event->{title}, $title, $event->{subtitle}, $directory, $event->{start}, $event->{stop}); - push(@at_matches, { otitle => $event->{title}, title => $title, subtitle => $event->{subtitle} ? $event->{subtitle} : "", directory => $directory, start => my_strftime("%H:%M", $event->{start}), stop => my_strftime("%H:%M", $event->{stop}), date => my_strftime("%A, %x",$event->{start}), channel => GetChannelDescByNumber($event->{vdr_id})}); - } else { - Log(LOG_AT, sprintf("AutoTimer: Programming Timer \"%s\" (Event-ID %s, %s - %s)", $title, $event->{event_id}, strftime("%Y%m%d-%H%M", localtime($event->{start})), strftime("%Y%m%d-%H%M", localtime($event->{stop})))); +sub my_encode_qp { + my $title = shift; + if ($title =~ /[\001-\037\200-\377]/) { + my $qptitle = $title; + $qptitle = "=?iso-8859-1?b?" . MIME::Base64::encode_base64($title, "") . "?="; + $qptitle =~ s#(=\?iso-8859-1\?b\?[^\?]{56})(?!\?=)#$1?=\n =?iso-8859-1?b?#g while ($qptitle =~ /=\?iso-8859-1\?b\?[^\?]{57,}\?=/); + return $qptitle; + } + return $title; +} - AT_ProgTimer(1, $event->{event_id}, $event->{vdr_id}, $event->{start}, $event->{stop}, $title, $event->{summary}, $at); +sub PackStatus { #TODO: unused + # make a 32 bit signed int with high 16 Bit as event_id and low 16 Bit as + # active value + my ($active, $event_id) = @_; - if ($at->{active} == 2) { - Log(LOG_AT, sprintf("AutoTimer: Disabling one-shot Timer")); - $at->{active} = 0; - $oneshots = 1; - } - $DONE->{$DoneStr} = $event->{stop} if($at->{done}); - } - } - } - } - if ($oneshots) { - Log(LOG_AT, sprintf("AutoTimer: saving because of one-shots triggered")); - AT_Write(@at); - } + # we must generate a 32 bit signed int, due perl knows no overflow at 32 bit, + # we have to do the overflow manually: - Log(LOG_AT, "Auto Timer: Done."); - Log(LOG_AT, "Auto Timer: Purging done list... (lowtime $low_time)"); - for(keys %$DONE) { delete $DONE->{$_} if($low_time > $DONE->{$_}) } - Log(LOG_AT, "Auto Timer: Save done list..."); - &DONE_Write($DONE) if($DONE); - Log(LOG_AT, "Auto Timer: Done."); + # is the 16th bit set? then the signed 32 bit int is negative! + if ($event_id & 0x8000) { - if ($dry_run) { - return @at_matches; - } + # strip the first bit (by & 0x7FFF) of the event_id, so a 15 bit + # (positive) int will remain, then shift the int 16 bits to the left and + # add active -- result is a 31 bit (always positive) int. + # The 32nd bit is the minus sign, and due the (binary) smallest value + # is the (int) lowest possible number, we have to substract the lowest + # value + 1 from the 31 bit value -- result is the signed 32 bit int equal + # to the (unsigned) 32 bit int. + return ($active | (($event_id & 0x7FFF) << 16)) - 0x80000000; + } else { + return $active | ($event_id << 16); + } } +sub UnpackActive { #TODO: unused + my ($tmstatus) = @_; -sub AT_ProgTimer { - my($active, $event_id, $channel, $start, $stop, $title, $summary, $at) = @_; - - $start -= ($CONFIG{TM_MARGIN_BEGIN} * 60); - $stop += ($CONFIG{TM_MARGIN_END} * 60); - - my $start_fmt = my_strftime("%H%M", $start); - my $found = 0; - for(ParseTimer(1)) { - if($_->{vdr_id} == $channel) { - if($_->{autotimer} == 2 && $event_id && $_->{event_id}) { - if($_->{event_id} == $event_id) { - $found = 1; - last; - } - } - - # event_ids didn't match, try matching using starting time - if($_->{start} eq $start) { - $found = 1; - last; - } - if($start_fmt eq my_strftime("%H%M", $_->{start})) { - if($VDRVERSION < 10323) { - if($_->{dor} == my_strftime("%d", $start)) { - $found = 1; - last; - } - } else { - if($_->{dor} eq my_strftime("%Y-%m-%d", $start)) { - $found = 1; - last; - } - } - } - } - } - - # we will only programm new timers, CheckTimers is responsible for - # updating existing timers - if (!$found) { - $title =~ s/\|/\:/g; - - my $autotimer=2; - unless(can_do_eventid_autotimer($channel)) { - $event_id = 0; - $autotimer = 1; - } - - Log(LOG_AT, sprintf("AT_ProgTimer: Programming Timer \"%s\" (Event-ID %s, %s - %s)", $title, $event_id, strftime("%Y%m%d-%H%M", localtime($start)), strftime("%Y%m%d-%H%M", localtime($stop)))); - ProgTimer( - 0, - $active, - $event_id, - $channel, - $start, - $stop, - $at->{prio} ? $at->{prio} : $CONFIG{AT_PRIORITY}, - $at->{lft} ? $at->{lft} : $CONFIG{AT_LIFETIME}, - $title, - append_timer_metadata($VDRVERSION < 10344 ? $summary : undef, $event_id, $autotimer, $CONFIG{TM_MARGIN_BEGIN}, $CONFIG{TM_MARGIN_END}, $at->{pattern}) - ); - if ($CONFIG{AT_SENDMAIL} == 1 && $can_use_net_smtp && ($CONFIG{MAIL_AUTH_USER} eq "" || $can_use_smtpauth)) { - my $sum = $summary; - # remove all HTML-Tags from text - $sum =~ s/\<[^\>]+\>/ /g; - # linefeeds - $sum =~ s/\|/\n/g; - my $dat = strftime("%A, %x", localtime($start)); - my $strt= strftime("%H:%M", localtime($start)); - my $end = strftime("%H:%M", localtime($stop)); - - eval { - local $SIG{__DIE__}; - - my $smtp = Net::SMTP->new($CONFIG{MAIL_SERVER}, Timeout => 30); - if($smtp) { - if ($CONFIG{MAIL_AUTH_USER} ne "") { - $smtp->auth($CONFIG{MAIL_AUTH_USER}, $CONFIG{MAIL_AUTH_PASS}) || return; - } - $smtp->mail("$CONFIG{MAIL_FROM}"); - $smtp->to($CONFIG{MAIL_TO}); - $smtp->data(); - $smtp->datasend("To: $CONFIG{MAIL_TO}\n"); - my $qptitle = my_encode_qp($title); - $smtp->datasend("Subject: AUTOTIMER: New timer created for $qptitle\n"); - $smtp->datasend("From: VDRAdmin-AM AutoTimer <$CONFIG{MAIL_FROM}>\n"); - $smtp->datasend("MIME-Version: 1.0\n"); - $smtp->datasend("Content-Type: text/plain; charset=iso-8859-1\n"); - $smtp->datasend("Content-Transfer-Encoding: 8bit\n"); - $smtp->datasend("\n"); - $smtp->datasend("Created AUTOTIMER for $title\n"); - $smtp->datasend("===========================================================================\n\n"); - $smtp->datasend("Channel: $channel\n\n"); - $smtp->datasend("$title\n"); - $smtp->datasend("$dat, $strt - $end\n\n"); - $smtp->datasend("Summary:\n"); - $smtp->datasend("--------\n"); - $smtp->datasend("$sum\n"); - $smtp->dataend(); - $smtp->quit(); - } else { - print("SMTP failed! Please check your email settings.\n"); - Log(LOG_FATALERROR, "SMTP failed! Please check your email settings."); - } - }; - if ($@) { - print("Failed to send email!\nPlease contact the author.\n"); - Log(LOG_FATALERROR, "Failed to send email! Please contact the author."); - }; - } elsif ($CONFIG{AT_SENDMAIL} == 1) { - print("Missing Perl module Net::SMTP.\nAutoTimer email notification disabled.\n"); - Log(LOG_FATALERROR, "Missing Perl module Net::SMTP. AutoTimer email notification disabled."); - if ($CONFIG{MAIL_AUTH_USER} ne "" && ! $can_use_smtpauth) { - print("Missing Perl module Authen::SASL and/or Digest::HMAC_MD5.\nAutoTimer email notification disabled.\n"); - Log(LOG_FATALERROR, "Missing Perl module Authen::SASL and/or Digest::HMAC_MD5. AutoTimer email notification disabled."); - } - } - } + # strip the first 16 bit + return ($tmstatus & 0xFFFF); } -sub my_encode_qp { - my $title = shift; - if ($title =~ /[\001-\037\200-\377]/) - { - my $qptitle = $title; - $qptitle = "=?iso-8859-1?b?" . MIME::Base64::encode_base64($title, "") . "?="; - $qptitle =~ s#(=\?iso-8859-1\?b\?[^\?]{56})(?!\?=)#$1?=\n =?iso-8859-1?b?#g while($qptitle =~ /=\?iso-8859-1\?b\?[^\?]{57,}\?=/); - return $qptitle; - } - return $title; -} - -sub PackStatus { #TODO: unused - # make a 32 bit signed int with high 16 Bit as event_id and low 16 Bit as - # active value - my($active, $event_id) = @_; - - # we must generate a 32 bit signed int, due perl knows no overflow at 32 bit, - # we have to do the overflow manually: - - # is the 16th bit set? then the signed 32 bit int is negative! - if ($event_id & 0x8000) { - # strip the first bit (by & 0x7FFF) of the event_id, so a 15 bit - # (positive) int will remain, then shift the int 16 bits to the left and - # add active -- result is a 31 bit (always positive) int. - # The 32nd bit is the minus sign, and due the (binary) smallest value - # is the (int) lowest possible number, we have to substract the lowest - # value + 1 from the 31 bit value -- result is the signed 32 bit int equal - # to the (unsigned) 32 bit int. - return ($active | (($event_id & 0x7FFF) << 16)) - 0x80000000; - } - else { - return $active | ($event_id << 16); - } -} - -sub UnpackActive { #TODO: unused - my($tmstatus) = @_; - # strip the first 16 bit - return ($tmstatus & 0xFFFF); -} - -sub UnpackEvent_id { #TODO: unused - my($tmstatus) = @_; - # remove the lower 16 bit by shifting the value 16 bits to the right - return $tmstatus >> 16; +sub UnpackEvent_id { #TODO: unused + my ($tmstatus) = @_; + + # remove the lower 16 bit by shifting the value 16 bits to the right + return $tmstatus >> 16; } sub CheckTimers { - my $event; - - for my $timer (ParseTimer(1)) { - # match by event_id - if($timer->{autotimer} == $AT_BY_EVENT_ID) { - for $event (@{$EPG{$timer->{vdr_id}}}) { - # look for matching event_id on the same channel -- it's unique - if($timer->{event_id} == $event->{event_id}) { - Log(LOG_CHECKTIMER, sprintf("CheckTimers: Checking timer \"%s\" (No. %s) for changes by Event-ID", $timer->{title}, $timer->{id})); - - # update timer if the existing one differs from the EPG - # (don't check for changed title, as this will break autotimers' "directory" setting) - if(($timer->{start} ne ($event->{start} - $timer->{bstart} * 60)) || - ($timer->{stop} ne ($event->{stop} + $timer->{bstop} * 60))) { - Log(LOG_CHECKTIMER, sprintf("CheckTimers: Timer \"%s\" (No. %s, Event-ID %s, %s - %s) differs from EPG: \"%s\", Event-ID %s, %s - %s)", $timer->{title}, $timer->{id}, $timer->{event_id}, strftime("%Y%m%d-%H%M", localtime($timer->{start})), strftime("%Y%m%d-%H%M", localtime($timer->{stop})), $event->{title}, $event->{event_id}, strftime("%Y%m%d-%H%M", localtime($event->{start})), strftime("%Y%m%d-%H%M", localtime($event->{stop})))); - ProgTimer( - $timer->{id}, - $timer->{active}, - $timer->{event_id}, - $timer->{vdr_id}, - $event->{start} - $timer->{bstart} * 60, - $event->{stop} + $timer->{bstop} * 60, - $timer->{prio}, - $timer->{lft}, - # don't update title as this may differ from what has been set by the user - $timer->{title}, - # leave summary untouched. - $timer->{summary}, - ); - Log(LOG_CHECKTIMER, sprintf("CheckTimers: Timer %s updated.", $timer->{id})); - } - } - } - } - # match by channel number and start/stop time - elsif($timer->{autotimer} == $AT_BY_TIME) { - # We're checking only timers which don't record - if ($timer->{start} > time()) { - Log(LOG_CHECKTIMER, sprintf("CheckTimers: Checking timer \"%s\" (No. %s) for changes by recording time", $timer->{title}, $timer->{id})); - my @eventlist; - - for my $event (@{$EPG{$timer->{vdr_id}}}) { - # look for events within the margins of the current timer - if(($event->{start} < $timer->{stop}) && ($event->{stop} > $timer->{start})) { - push @eventlist, $event; - } - } - # now we have all events in eventlist that touch the old timer margins - # check for each event how probable it is matching the old timer - if(scalar(@eventlist) > 0) { - my $origlen = ($timer->{stop} - $timer->{bstop} * 60) - ($timer->{start} + $timer->{bstart} * 60); - my $maxwight = 0; - $event = $eventlist[0]; - - for (my $i=0; $i < scalar(@eventlist); $i++) { - my($start, $stop); - - if($eventlist[$i]->{start} < $timer->{start}) { - $start = $timer->{start}; - } else { - $start = $eventlist[$i]->{start}; + my $event; + + for my $timer (ParseTimer(1)) { + + # match by event_id + if ($timer->{autotimer} == $AT_BY_EVENT_ID) { + for $event (@{ $EPG{ $timer->{vdr_id} } }) { + + # look for matching event_id on the same channel -- it's unique + if ($timer->{event_id} == $event->{event_id}) { + Log(LOG_CHECKTIMER, sprintf("CheckTimers: Checking timer \"%s\" (No. %s) for changes by Event-ID", $timer->{title}, $timer->{id})); + + # update timer if the existing one differs from the EPG + # (don't check for changed title, as this will break autotimers' "directory" setting) + if ( ($timer->{start} ne ($event->{start} - $timer->{bstart} * 60)) + || ($timer->{stop} ne ($event->{stop} + $timer->{bstop} * 60))) + { + Log(LOG_CHECKTIMER, sprintf("CheckTimers: Timer \"%s\" (No. %s, Event-ID %s, %s - %s) differs from EPG: \"%s\", Event-ID %s, %s - %s)", $timer->{title}, $timer->{id}, $timer->{event_id}, strftime("%Y%m%d-%H%M", localtime($timer->{start})), strftime("%Y%m%d-%H%M", localtime($timer->{stop})), $event->{title}, $event->{event_id}, strftime("%Y%m%d-%H%M", localtime($event->{start})), strftime("%Y%m%d-%H%M", localtime($event->{stop})))); + ProgTimer( + $timer->{id}, + $timer->{active}, + $timer->{event_id}, + $timer->{vdr_id}, + $event->{start} - $timer->{bstart} * 60, + $event->{stop} + $timer->{bstop} * 60, + $timer->{prio}, + $timer->{lft}, + + # don't update title as this may differ from what has been set by the user + $timer->{title}, + + # leave summary untouched. + $timer->{summary}, + ); + Log(LOG_CHECKTIMER, sprintf("CheckTimers: Timer %s updated.", $timer->{id})); + } + } } - if($eventlist[$i]->{stop} > $timer->{stop}) { - $stop = $timer->{stop}; - } else { - $stop = $eventlist[$i]->{stop}; - } - - my $wight = ($stop - $start) / ($eventlist[$i]->{stop} - $eventlist[$i]->{start}); + } - if($wight > $maxwight && (($eventlist[$i]->{stop} - $eventlist[$i]->{start}) / $origlen) >= 0.9 ) { - $maxwight = $wight; - $event = $eventlist[$i]; + # match by channel number and start/stop time + elsif ($timer->{autotimer} == $AT_BY_TIME) { + + # We're checking only timers which don't record + if ($timer->{start} > time()) { + Log(LOG_CHECKTIMER, sprintf("CheckTimers: Checking timer \"%s\" (No. %s) for changes by recording time", $timer->{title}, $timer->{id})); + my @eventlist; + + for my $event (@{ $EPG{ $timer->{vdr_id} } }) { + + # look for events within the margins of the current timer + if (($event->{start} < $timer->{stop}) && ($event->{stop} > $timer->{start})) { + push @eventlist, $event; + } + } + + # now we have all events in eventlist that touch the old timer margins + # check for each event how probable it is matching the old timer + if (scalar(@eventlist) > 0) { + my $origlen = ($timer->{stop} - $timer->{bstop} * 60) - ($timer->{start} + $timer->{bstart} * 60); + my $maxwight = 0; + $event = $eventlist[0]; + + for (my $i = 0 ; $i < scalar(@eventlist) ; $i++) { + my ($start, $stop); + + if ($eventlist[$i]->{start} < $timer->{start}) { + $start = $timer->{start}; + } else { + $start = $eventlist[$i]->{start}; + } + if ($eventlist[$i]->{stop} > $timer->{stop}) { + $stop = $timer->{stop}; + } else { + $stop = $eventlist[$i]->{stop}; + } + + my $wight = ($stop - $start) / ($eventlist[$i]->{stop} - $eventlist[$i]->{start}); + + if ($wight > $maxwight && (($eventlist[$i]->{stop} - $eventlist[$i]->{start}) / $origlen) >= 0.9) { + $maxwight = $wight; + $event = $eventlist[$i]; + } + } + + # update timer if the existing one differs from the EPG + if ( ($timer->{start} > ($event->{start} - $timer->{bstart} * 60)) + || ($timer->{stop} < ($event->{stop} + $timer->{bstop} * 60))) + { + Log(LOG_CHECKTIMER, sprintf("CheckTimers: Timer \"%s\" (No. %s, Event-ID %s, %s - %s) differs from EPG: \"%s\", Event-ID %s, %s - %s)", $timer->{title}, $timer->{id}, $timer->{event_id}, strftime("%Y%m%d-%H%M", localtime($timer->{start})), strftime("%Y%m%d-%H%M", localtime($timer->{stop})), $event->{title}, $event->{event_id}, strftime("%Y%m%d-%H%M", localtime($event->{start})), strftime("%Y%m%d-%H%M", localtime($event->{stop})))); + ProgTimer( + $timer->{id}, + $timer->{active}, + 0, + $timer->{vdr_id}, + $timer->{start} > ($event->{start} - $timer->{bstart} * 60) ? $event->{start} - $timer->{bstart} * 60 : $timer->{start}, + $timer->{stop} < ($event->{stop} + $timer->{bstop} * 60) ? $event->{stop} + $timer->{bstop} * 60 : $timer->{stop}, + $timer->{prio}, + $timer->{lft}, + + # don't touch the title since we're not too sure about the event + $timer->{title}, + + # leave summary untouched. + $timer->{summary}, + ); + Log(LOG_CHECKTIMER, sprintf("CheckTimers: Timer %s updated.", $timer->{id})); + } + } + } else { + Log(LOG_CHECKTIMER, sprintf("CheckTimers: Skipping Timer \"%s\" (No. %s, %s - %s)", $timer->{title}, $timer->{id}, strftime("%Y%m%d-%H%M", localtime($timer->{start})), strftime("%Y%m%d-%H%M", localtime($timer->{stop})))); } - } - # update timer if the existing one differs from the EPG - if(($timer->{start} > ($event->{start} - $timer->{bstart} * 60)) || - ($timer->{stop} < ($event->{stop} + $timer->{bstop} * 60))) { - Log(LOG_CHECKTIMER, sprintf("CheckTimers: Timer \"%s\" (No. %s, Event-ID %s, %s - %s) differs from EPG: \"%s\", Event-ID %s, %s - %s)", $timer->{title}, $timer->{id}, $timer->{event_id}, strftime("%Y%m%d-%H%M", localtime($timer->{start})), strftime("%Y%m%d-%H%M", localtime($timer->{stop})), $event->{title}, $event->{event_id}, strftime("%Y%m%d-%H%M", localtime($event->{start})), strftime("%Y%m%d-%H%M", localtime($event->{stop})))); - ProgTimer( - $timer->{id}, - $timer->{active}, - 0, - $timer->{vdr_id}, - $timer->{start} > ($event->{start} - $timer->{bstart} * 60) ? $event->{start} - $timer->{bstart} * 60 : $timer->{start}, - $timer->{stop} < ($event->{stop} + $timer->{bstop} * 60) ? $event->{stop} + $timer->{bstop} * 60 : $timer->{stop}, - $timer->{prio}, - $timer->{lft}, - # don't touch the title since we're not too sure about the event - $timer->{title}, - # leave summary untouched. - $timer->{summary}, - ); - Log(LOG_CHECKTIMER, sprintf("CheckTimers: Timer %s updated.", $timer->{id})); - } } - } else { - Log(LOG_CHECKTIMER, sprintf("CheckTimers: Skipping Timer \"%s\" (No. %s, %s - %s)", $timer->{title}, $timer->{id}, strftime("%Y%m%d-%H%M", localtime($timer->{start})), strftime("%Y%m%d-%H%M", localtime($timer->{stop})))); - } } - } } ############################################################################# # regulary timers ############################################################################# sub my_mktime { - my $sec = 0; - my $min = shift; - my $hour = shift; - my $mday = shift; - my $mon = shift; - my $year = shift() - 1900; + my $sec = 0; + my $min = shift; + my $hour = shift; + my $mday = shift; + my $mon = shift; + my $year = shift() - 1900; - #my $time = mktime($sec, $min, $hour, $mday, $mon, $year, 0, 0, (localtime(time))[8]); - my $time = mktime($sec, $min, $hour, $mday, $mon, $year, 0, 0, -1); + #my $time = mktime($sec, $min, $hour, $mday, $mon, $year, 0, 0, (localtime(time))[8]); + my $time = mktime($sec, $min, $hour, $mday, $mon, $year, 0, 0, -1); } sub ParseTimer { - my $pc = shift; #TODO: what's this supposed to do? - my $tid = shift; - my $entry = 1; - - my @temp; - for(SendCMD("lstt")) { - last if(/^No timers defined/); - chomp; - my($id, $temp) = split(/ /, $_, 2); - my($active, $vdr_id, $dor, $start, $stop, $prio, $lft, $title, $summary) = split(/\:/, $temp, 9); - - my($startsse, $stopsse, $weekday, $off, $perrec, $length, $first); - - my($autotimer, $event_id, $bstart, $bstop, $pattern); - ($autotimer, $event_id, $bstart, $bstop, $pattern) = extract_timer_metadata($summary); - - # VDR > 1.3.24 sets a bit if it's currently recording - my $recording = 0; - $recording = 1 if(($active & 8) == 8); - $active = 1 if($active == 3 || $active == 9); - #$active = 1 if(($active & 1) == 1); #TODO - - # replace "|" by ":" in timer's title (man vdr.5) - $title =~ s/\|/\:/g; - my $title_js = $title; - $title_js =~ s/\'/\\\'/g; - $title_js =~ s/\"/"/g; - - if(length($dor) == 7) { # repeating timer - $startsse = my_mktime(substr($start, 2, 2), substr($start, 0, 2), my_strftime("%d"), (my_strftime("%m") - 1), my_strftime("%Y")); - $stopsse = my_mktime(substr($stop, 2, 2), substr($stop, 0, 2), my_strftime("%d"), (my_strftime("%m") - 1), my_strftime("%Y")); - if($stopsse < $startsse) { - $stopsse += 86400; # +1day - } - $weekday = ((localtime(time))[6] + 6) % 7; - $perrec = join("", substr($dor, $weekday), substr($dor, 0, $weekday)); - $perrec =~ m/^-+/g; - - $off = (pos $perrec) * 86400; - if($off == 0 && $stopsse < time) { - #$weekday = ($weekday + 1) % 7; - $perrec = join("", substr($dor, ($weekday + 1) % 7), substr($dor, 0, ($weekday + 1) % 7)); - $perrec =~ m/^-+/g; - $off = ((pos $perrec) + 1) * 86400; - } - $startsse += $off; - $stopsse += $off; - } elsif(length($dor) == 18) { # first-day timer - $dor =~ /.{7}\@(\d\d\d\d)-(\d\d)-(\d\d)/; - $startsse = my_mktime(substr($start, 2, 2), substr($start, 0, 2), $3, ($2 - 1), $1); - # 31 + 1 = ?? - $stopsse = my_mktime(substr($stop, 2, 2), substr($stop, 0, 2), $stop > $start ? $3 : $3 + 1, ($2 - 1), $1); - } else { # regular timer - if ($dor =~ /(\d\d\d\d)-(\d\d)-(\d\d)/) { # vdr >= 1.3.23 - $startsse = my_mktime(substr($start, 2, 2), substr($start, 0, 2), $3, ($2 - 1), $1); - $stopsse = my_mktime(substr($stop, 2, 2), substr($stop, 0, 2), $stop > $start ? $3 : $3 + 1, ($2 - 1), $1); - } - else { # vdr < 1.3.23 - $startsse = my_mktime(substr($start, 2, 2), substr($start, 0, 2), $dor, (my_strftime("%m") - 1), my_strftime("%Y")); - $stopsse = my_mktime(substr($stop, 2, 2), substr($stop, 0, 2), $stop > $start ? $dor : $dor + 1, (my_strftime("%m") - 1), my_strftime("%Y")); - - # move timers which have expired one month into the future - if(length($dor) != 7 && $stopsse < time) { - $startsse = my_mktime(substr($start, 2, 2), substr($start, 0, 2), $dor, (my_strftime("%m") % 12), (my_strftime("%Y") + (my_strftime("%m") == 12 ? 1 : 0))); - $stopsse = my_mktime(substr($stop, 2, 2), substr($stop, 0, 2), $stop > $start ? $dor : $dor + 1, (my_strftime("%m") % 12), (my_strftime("%Y") + (my_strftime("%m") == 12 ? 1 : 0))); - } - } - } - - if($CONFIG{RECORDINGS} && length($dor) == 7) { # repeating timer - # generate repeating timer entries for up to 28 days - $first = 1; - for($weekday += $off / 86400, $off = 0; $off < 28; $off++) { - $perrec = join("", substr($dor, ($weekday + $off) % 7), substr($dor, 0, ($weekday + $off) % 7)); - $perrec =~ m/^-+/g; - next if($perrec && ((pos $perrec) != 0)); - - $length = push(@temp, { - id => $id, - vdr_id => $vdr_id, - start => $startsse, - stop => $stopsse, - startsse => $startsse + $off * 86400, - stopsse => $stopsse + $off * 86400, - active => $active, - recording => $first ? $recording : 0, # only the first might record - event_id => $event_id, - cdesc => get_name_from_vdrid($vdr_id), - transponder => get_transponder_from_vdrid($vdr_id), - ca => get_ca_from_vdrid($vdr_id), - dor => $dor, - prio => $prio, - lft => $lft, - title => $title, - title_js => $title_js, - summary => $summary, - collision => 0, - critical => 0, - first => $first, - proglink => sprintf("%s?aktion=prog_list&vdr_id=%s", $MyURL, $vdr_id), - autotimer => $autotimer, - bstart => $bstart, - bstop => $bstop, - pattern => $pattern - }); - $first = 0; - } + my $pc = shift; #TODO: what's this supposed to do? + my $tid = shift; + my $entry = 1; + + my @temp; + for (SendCMD("lstt")) { + last if (/^No timers defined/); + chomp; + my ($id, $temp) = split(/ /, $_, 2); + my ($active, $vdr_id, $dor, $start, $stop, $prio, $lft, $title, $summary) = split(/\:/, $temp, 9); + + my ($startsse, $stopsse, $weekday, $off, $perrec, $length, $first); + + my ($autotimer, $event_id, $bstart, $bstop, $pattern); + ($autotimer, $event_id, $bstart, $bstop, $pattern) = extract_timer_metadata($summary); + + # VDR > 1.3.24 sets a bit if it's currently recording + my $recording = 0; + $recording = 1 if (($active & 8) == 8); + $active = 1 if ($active == 3 || $active == 9); + + #$active = 1 if(($active & 1) == 1); #TODO + + # replace "|" by ":" in timer's title (man vdr.5) + $title =~ s/\|/\:/g; + my $title_js = $title; + $title_js =~ s/\'/\\\'/g; + $title_js =~ s/\"/"/g; + + if (length($dor) == 7) { # repeating timer + $startsse = my_mktime(substr($start, 2, 2), substr($start, 0, 2), my_strftime("%d"), (my_strftime("%m") - 1), my_strftime("%Y")); + $stopsse = my_mktime(substr($stop, 2, 2), substr($stop, 0, 2), my_strftime("%d"), (my_strftime("%m") - 1), my_strftime("%Y")); + if ($stopsse < $startsse) { + $stopsse += 86400; # +1day + } + $weekday = ((localtime(time))[6] + 6) % 7; + $perrec = join("", substr($dor, $weekday), substr($dor, 0, $weekday)); + $perrec =~ m/^-+/g; + + $off = (pos $perrec) * 86400; + if ($off == 0 && $stopsse < time) { + + #$weekday = ($weekday + 1) % 7; + $perrec = join("", substr($dor, ($weekday + 1) % 7), substr($dor, 0, ($weekday + 1) % 7)); + $perrec =~ m/^-+/g; + $off = ((pos $perrec) + 1) * 86400; + } + $startsse += $off; + $stopsse += $off; + } elsif (length($dor) == 18) { # first-day timer + $dor =~ /.{7}\@(\d\d\d\d)-(\d\d)-(\d\d)/; + $startsse = my_mktime(substr($start, 2, 2), substr($start, 0, 2), $3, ($2 - 1), $1); + + # 31 + 1 = ?? + $stopsse = my_mktime(substr($stop, 2, 2), substr($stop, 0, 2), $stop > $start ? $3 : $3 + 1, ($2 - 1), $1); + } else { # regular timer + if ($dor =~ /(\d\d\d\d)-(\d\d)-(\d\d)/) { # vdr >= 1.3.23 + $startsse = my_mktime(substr($start, 2, 2), substr($start, 0, 2), $3, ($2 - 1), $1); + $stopsse = my_mktime(substr($stop, 2, 2), substr($stop, 0, 2), $stop > $start ? $3 : $3 + 1, ($2 - 1), $1); + } else { # vdr < 1.3.23 + $startsse = my_mktime(substr($start, 2, 2), substr($start, 0, 2), $dor, (my_strftime("%m") - 1), my_strftime("%Y")); + $stopsse = my_mktime(substr($stop, 2, 2), substr($stop, 0, 2), $stop > $start ? $dor : $dor + 1, (my_strftime("%m") - 1), my_strftime("%Y")); + + # move timers which have expired one month into the future + if (length($dor) != 7 && $stopsse < time) { + $startsse = my_mktime(substr($start, 2, 2), substr($start, 0, 2), $dor, (my_strftime("%m") % 12), (my_strftime("%Y") + (my_strftime("%m") == 12 ? 1 : 0))); + $stopsse = my_mktime(substr($stop, 2, 2), substr($stop, 0, 2), $stop > $start ? $dor : $dor + 1, (my_strftime("%m") % 12), (my_strftime("%Y") + (my_strftime("%m") == 12 ? 1 : 0))); + } + } + } + + if ($CONFIG{RECORDINGS} && length($dor) == 7) { # repeating timer + # generate repeating timer entries for up to 28 days + $first = 1; + for ($weekday += $off / 86400, $off = 0 ; $off < 28 ; $off++) { + $perrec = join("", substr($dor, ($weekday + $off) % 7), substr($dor, 0, ($weekday + $off) % 7)); + $perrec =~ m/^-+/g; + next if ($perrec && ((pos $perrec) != 0)); + + $length = push( + @temp, + { id => $id, + vdr_id => $vdr_id, + start => $startsse, + stop => $stopsse, + startsse => $startsse + $off * 86400, + stopsse => $stopsse + $off * 86400, + active => $active, + recording => $first ? $recording : 0, # only the first might record + event_id => $event_id, + cdesc => get_name_from_vdrid($vdr_id), + transponder => get_transponder_from_vdrid($vdr_id), + ca => get_ca_from_vdrid($vdr_id), + dor => $dor, + prio => $prio, + lft => $lft, + title => $title, + title_js => $title_js, + summary => $summary, + collision => 0, + critical => 0, + first => $first, + proglink => sprintf("%s?aktion=prog_list&vdr_id=%s", $MyURL, $vdr_id), + autotimer => $autotimer, + bstart => $bstart, + bstop => $bstop, + pattern => $pattern + } + ); + $first = 0; + } + } else { + $length = push(@temp, + { id => $id, + vdr_id => $vdr_id, + start => $startsse, + stop => $stopsse, + startsse => $startsse, + stopsse => $stopsse, + active => $active, + recording => $recording, + event_id => $event_id, + cdesc => get_name_from_vdrid($vdr_id), + transponder => get_transponder_from_vdrid($vdr_id), + ca => get_ca_from_vdrid($vdr_id), + dor => $dor, + prio => $prio, + lft => $lft, + title => $title, + title_js => $title_js, + summary => $summary, + collision => 0, + critical => 0, + first => -1, + proglink => sprintf("%s?aktion=prog_list&vdr_id=%s", $MyURL, $vdr_id), + autotimer => $autotimer, + bstart => $bstart, + bstop => $bstop, + pattern => $pattern + } + ); + } + + # save index of entry with specific timer id for later use + if ($tid && $tid == $id) { + $entry = $length; + } + } + + if ($tid) { + return ($temp[ $entry - 1 ]); } else { - $length = push(@temp, { - id => $id, - vdr_id => $vdr_id, - start => $startsse, - stop => $stopsse, - startsse => $startsse, - stopsse => $stopsse, - active => $active, - recording => $recording, - event_id => $event_id, - cdesc => get_name_from_vdrid($vdr_id), - transponder => get_transponder_from_vdrid($vdr_id), - ca => get_ca_from_vdrid($vdr_id), - dor => $dor, - prio => $prio, - lft => $lft, - title => $title, - title_js => $title_js, - summary => $summary, - collision => 0, - critical => 0, - first => -1, - proglink => sprintf("%s?aktion=prog_list&vdr_id=%s", $MyURL, $vdr_id), - autotimer => $autotimer, - bstart => $bstart, - bstop => $bstop, - pattern => $pattern - }); - } - - # save index of entry with specific timer id for later use - if($tid && $tid == $id) { - $entry = $length; - } - } - - if($tid) { - return($temp[$entry - 1]); - } else { - return(@temp); - } + return (@temp); + } } # extract out own metadata from a timer's aux field. sub extract_timer_metadata { - my $aux = shift; - return unless( $aux =~ /<vdradmin-am>(.*)<\/vdradmin-am>/i); - $aux = $1; - my $epg_id = $1 if ($aux =~ /<epgid>(.*)<\/epgid>/i); - my $autotimer = $1 if ($aux =~ /<autotimer>(.*)<\/autotimer>/i); - my $bstart = $1 if ($aux =~ /<bstart>(.*)<\/bstart>/i); - my $bstop = $1 if ($aux =~ /<bstop>(.*)<\/bstop>/i); - my $pattern = $1 if ($aux =~ /<pattern>(.*)<\/pattern>/i); - return ($autotimer, $epg_id, $bstart, $bstop, $pattern); + my $aux = shift; + return unless ($aux =~ /<vdradmin-am>(.*)<\/vdradmin-am>/i); + $aux = $1; + my $epg_id = $1 if ($aux =~ /<epgid>(.*)<\/epgid>/i); + my $autotimer = $1 if ($aux =~ /<autotimer>(.*)<\/autotimer>/i); + my $bstart = $1 if ($aux =~ /<bstart>(.*)<\/bstart>/i); + my $bstop = $1 if ($aux =~ /<bstop>(.*)<\/bstop>/i); + my $pattern = $1 if ($aux =~ /<pattern>(.*)<\/pattern>/i); + return ($autotimer, $epg_id, $bstart, $bstop, $pattern); } sub append_timer_metadata { - my ($aux, $epg_id, $autotimer, $bstart, $bstop, $pattern) = @_; - # remove old autotimer info - $aux =~ s/\|?<vdradmin-am>.*<\/vdradmin-am>//i if($aux); - $aux = substr($aux, 0, 9000) if($VDRVERSION < 10336 and length($aux) > 9000); - # add a new line if VDR<1.3.44 because then there might be a summary - $aux .= "|" if($VDRVERSION < 10344 and length($aux)); - $aux .= "<vdradmin-am>"; - $aux .= "<epgid>$epg_id</epgid>" if($epg_id); - $aux .= "<autotimer>$autotimer</autotimer>" if($autotimer); - $aux .= "<bstart>$bstart</bstart>" if($bstart); - $aux .= "<bstop>$bstop</bstop>" if($bstop); - $aux .= "<pattern>$pattern</pattern>" if($pattern); - $aux .= "</vdradmin-am>"; - return $aux; + my ($aux, $epg_id, $autotimer, $bstart, $bstop, $pattern) = @_; + + # remove old autotimer info + $aux =~ s/\|?<vdradmin-am>.*<\/vdradmin-am>//i if ($aux); + $aux = substr($aux, 0, 9000) if ($VDRVERSION < 10336 and length($aux) > 9000); + + # add a new line if VDR<1.3.44 because then there might be a summary + $aux .= "|" if ($VDRVERSION < 10344 and length($aux)); + $aux .= "<vdradmin-am>"; + $aux .= "<epgid>$epg_id</epgid>" if ($epg_id); + $aux .= "<autotimer>$autotimer</autotimer>" if ($autotimer); + $aux .= "<bstart>$bstart</bstart>" if ($bstart); + $aux .= "<bstop>$bstop</bstop>" if ($bstop); + $aux .= "<pattern>$pattern</pattern>" if ($pattern); + $aux .= "</vdradmin-am>"; + return $aux; } ############################################################################# # Tools ############################################################################# sub DisplayMessage { - my $message = shift; - SendCMD(sprintf("mesg %s", $message)); + my $message = shift; + SendCMD(sprintf("mesg %s", $message)); } sub LoadTranslation { - undef %ERROR_MESSAGE; - - %ERROR_MESSAGE = ( - not_found => gettext("Not found"), - notfound_long => gettext("The requested URL was not found on this server!"), - notfound_file => gettext("The URL \"%s\" was not found on this server!"), - forbidden => gettext("Forbidden"), - forbidden_long => gettext("You don't have permission to access this function!"), - forbidden_file => gettext("Access to file \"%s\" denied!"), - cant_open => gettext("Can't open file \"%s\"!"), - connect_failed => gettext("Can't connect to VDR at %s:%s<br /><br />Please check if VDR is running and if VDR's svdrphosts.conf is configured correctly."), - send_command => gettext("Error while sending command to VDR at %s"), - ); + undef %ERROR_MESSAGE; + + %ERROR_MESSAGE = (not_found => gettext("Not found"), + notfound_long => gettext("The requested URL was not found on this server!"), + notfound_file => gettext("The URL \"%s\" was not found on this server!"), + forbidden => gettext("Forbidden"), + forbidden_long => gettext("You don't have permission to access this function!"), + forbidden_file => gettext("Access to file \"%s\" denied!"), + cant_open => gettext("Can't open file \"%s\"!"), + connect_failed => gettext("Can't connect to VDR at %s:%s<br /><br />Please check if VDR is running and if VDR's svdrphosts.conf is configured correctly."), + send_command => gettext("Error while sending command to VDR at %s"), + ); - setlocale(LC_ALL, $CONFIG{LANG}); + setlocale(LC_ALL, $CONFIG{LANG}); } sub HelpURL { - my $area = shift; - return(sprintf("%s?aktion=show_help&area=%s", $MyURL, $area)); + my $area = shift; + return (sprintf("%s?aktion=show_help&area=%s", $MyURL, $area)); } sub ProgTimer { - # $start and $stop are expected as seconds since 00:00:00 1970-01-01 UTC. - my($timer_id, $active, $event_id, $channel, $start, $stop, $prio, $lft, $title, $summary, $dor) = @_; - - $title =~ s/\:/|/g; # replace ":" by "|" in timer's title (man vdr.5) - - my $send_cmd = $timer_id ? "modt $timer_id" : "newt"; - my $send_dor = $dor ? $dor : RemoveLeadingZero(strftime("%d", localtime($start))); - my $send_summary = ($VDRVERSION >= 10336) ? $summary : substr($summary, 0, $VDR_MAX_SVDRP_LENGTH - 9 - length($send_cmd) - length($active) - length($channel) - length($send_dor) - 8 - length($prio) - length($lft) - length($title)); - - Log(LOG_AT, sprintf("ProgTimer: Programming Timer \"%s\" (Channel %s, Event-ID %s, %s - %s, Active %s)", $title, $channel, $event_id, my_strftime("%Y%m%d-%H%M", $start), my_strftime("%Y%m%d-%H%M", $stop), $active)); - my $return = SendCMD( - sprintf("%s %s:%s:%s:%s:%s:%s:%s:%s:%s", - $send_cmd, - $active, - $channel, - $send_dor, - strftime("%H%M", localtime($start)), - strftime("%H%M", localtime($stop)), - $prio, - $lft, - $title, - $send_summary - ) - ); - return $return; + + # $start and $stop are expected as seconds since 00:00:00 1970-01-01 UTC. + my ($timer_id, $active, $event_id, $channel, $start, $stop, $prio, $lft, $title, $summary, $dor) = @_; + + $title =~ s/\:/|/g; # replace ":" by "|" in timer's title (man vdr.5) + + my $send_cmd = $timer_id ? "modt $timer_id" : "newt"; + my $send_dor = $dor ? $dor : RemoveLeadingZero(strftime("%d", localtime($start))); + my $send_summary = ($VDRVERSION >= 10336) ? $summary : substr($summary, 0, $VDR_MAX_SVDRP_LENGTH - 9 - length($send_cmd) - length($active) - length($channel) - length($send_dor) - 8 - length($prio) - length($lft) - length($title)); + + Log(LOG_AT, sprintf("ProgTimer: Programming Timer \"%s\" (Channel %s, Event-ID %s, %s - %s, Active %s)", $title, $channel, $event_id, my_strftime("%Y%m%d-%H%M", $start), my_strftime("%Y%m%d-%H%M", $stop), $active)); + my $return = SendCMD(sprintf("%s %s:%s:%s:%s:%s:%s:%s:%s:%s", $send_cmd, $active, $channel, $send_dor, strftime("%H%M", localtime($start)), strftime("%H%M", localtime($stop)), $prio, $lft, $title, $send_summary)); + return $return; } sub RedirectToReferer { - my $url = shift; - if($Referer =~ /vdradmin\.pl\?.*$/) { - return(headerForward($Referer)); - } else { - return(headerForward($url)); - } -} - -sub salt { #TODO: unused - $_ = $_[0]; - my $string; - my($offset1, $offset2); - if(length($_) > 8) { - $offset1 = length($_) - 9; - $offset2 = length($_) - 1; - } else { - $offset1 = 0; - $offset2 = length($_) - 1; - } - $string = substr($_, $offset1, 1); - $string .= substr($_, $offset2, 1); - return($string); + my $url = shift; + if ($Referer =~ /vdradmin\.pl\?.*$/) { + return (headerForward($Referer)); + } else { + return (headerForward($url)); + } +} + +sub salt { #TODO: unused + $_ = $_[0]; + my $string; + my ($offset1, $offset2); + if (length($_) > 8) { + $offset1 = length($_) - 9; + $offset2 = length($_) - 1; + } else { + $offset1 = 0; + $offset2 = length($_) - 1; + } + $string = substr($_, $offset1, 1); + $string .= substr($_, $offset2, 1); + return ($string); } sub Shutdown { - CloseSocket(); - unlink($PIDFILE); - exit(0) -}; + CloseSocket(); + unlink($PIDFILE); + exit(0); +} sub getPID { - open(PID, shift); - $_ = <PID>; - close(PID); - return($_); + open(PID, shift); + $_ = <PID>; + close(PID); + return ($_); } sub writePID { - open(FILE, ">$PIDFILE"); - print FILE shift; - close(FILE); + open(FILE, ">$PIDFILE"); + print FILE shift; + close(FILE); } sub HupSignal { - UptoDate(1); + UptoDate(1); } sub UptoDate { - my $force = shift; - if(((time() - $CONFIG{CACHE_LASTUPDATE}) >= ($CONFIG{CACHE_TIMEOUT} * 60)) || $force) { - OpenSocket(); - ChanTree(); - if (@CHAN) { - EPG_buildTree(); - CheckTimers(); - AutoTimer(); - CloseSocket(); - $CONFIG{CACHE_LASTUPDATE} = time(); - } else { - return; - } - } - return(0); + my $force = shift; + if (((time() - $CONFIG{CACHE_LASTUPDATE}) >= ($CONFIG{CACHE_TIMEOUT} * 60)) || $force) { + OpenSocket(); + ChanTree(); + if (@CHAN) { + EPG_buildTree(); + CheckTimers(); + AutoTimer(); + CloseSocket(); + $CONFIG{CACHE_LASTUPDATE} = time(); + } else { + return; + } + } + return (0); } sub Log { - if($#_ >= 1) { - my $level = shift; - my $message = join("", @_); - print $message . "\n" if $DEBUG; - if($CONFIG{LOGGING}) { - if($CONFIG{LOGLEVEL} & $level) { - open(LOGFILE, ">>" . $LOGFILE); - print LOGFILE sprintf("%s: %s\n", my_strftime("%x %X"), $message); - close(LOGFILE); - } - } - } else { - Log(LOG_FATALERROR, "bogus Log() call"); - } + if ($#_ >= 1) { + my $level = shift; + my $message = join("", @_); + print $message . "\n" if $DEBUG; + if ($CONFIG{LOGGING}) { + if ($CONFIG{LOGLEVEL} & $level) { + open(LOGFILE, ">>" . $LOGFILE); + print LOGFILE sprintf("%s: %s\n", my_strftime("%x %X"), $message); + close(LOGFILE); + } + } + } else { + Log(LOG_FATALERROR, "bogus Log() call"); + } } sub my_normalize { - my $text = shift; - $text =~ s/[\t\n]//g; - return $text; + my $text = shift; + $text =~ s/[\t\n]//g; + return $text; } sub TemplateNew { - my $file = shift; - - my $translation_filter = sub { - my $text_ref = shift; - $$text_ref =~ s/<%! (.*?) !%>/gettext(my_normalize($1))/ges; - }; - - $CONFIG{TEMPLATE} = "default" if(!$CONFIG{TEMPLATE}); - $file = "$TEMPLATEDIR/$CONFIG{TEMPLATE}/$file"; - if(!-e $file) { - Log(LOG_FATALERROR, "Fatal! Can't find $file!"); - } - my $template = HTML::Template::Expr->new( - die_on_bad_params => 0, - loop_context_vars => 1, - #DEBUG => DEBUG_ALL, - filter => $translation_filter, - filename => $file + my $file = shift; + + my $translation_filter = sub { + my $text_ref = shift; + $$text_ref =~ s/<%! (.*?) !%>/gettext(my_normalize($1))/ges; + }; + + $CONFIG{TEMPLATE} = "default" if (!$CONFIG{TEMPLATE}); + $file = "$TEMPLATEDIR/$CONFIG{TEMPLATE}/$file"; + if (!-e $file) { + Log(LOG_FATALERROR, "Fatal! Can't find $file!"); + } + my $template = HTML::Template::Expr->new( + die_on_bad_params => 0, + loop_context_vars => 1, + + #DEBUG => DEBUG_ALL, + filter => $translation_filter, + filename => $file ); - return $template; + return $template; } sub my_strftime { - my $format = shift; - my $time = shift; - return(strftime($format, $time ? localtime($time) : localtime(time))); + my $format = shift; + my $time = shift; + return (strftime($format, $time ? localtime($time) : localtime(time))); } sub my_strfgmtime { - my $format = shift; - my $time = shift; - return(strftime($format, $time ? gmtime($time) : gmtime(time))); + my $format = shift; + my $time = shift; + return (strftime($format, $time ? gmtime($time) : gmtime(time))); } -sub GetFirstChannel { #TODO: unused - return($CHAN[0]->{service_id}); +sub GetFirstChannel { #TODO: unused + return ($CHAN[0]->{service_id}); } sub ChannelHasEPG { - my $service_id = shift; - for my $event (@{$EPG{$service_id}}) { - return(1); - } - return(0); + my $service_id = shift; + for my $event (@{ $EPG{$service_id} }) { + return (1); + } + return (0); } sub Encode_Referer { - if($_[0]) { $_ = $_[0]; } else { $_ = $Referer; } - return(MIME::Base64::encode_base64($_)); + if ($_[0]) { $_ = $_[0]; } + else { $_ = $Referer; } + return (MIME::Base64::encode_base64($_)); } sub Decode_Referer { - return(MIME::Base64::decode_base64(shift)); + return (MIME::Base64::decode_base64(shift)); } -sub encode_ref { #TODO: unused - my($tmp) = $_[0]->url(-relative=>1,-query=>1); - my(undef, $query) = split(/\?/, $tmp, 2); - return(MIME::Base64::encode_base64($query)); +sub encode_ref { #TODO: unused + my ($tmp) = $_[0]->url(-relative => 1, -query => 1); + my (undef, $query) = split(/\?/, $tmp, 2); + return (MIME::Base64::encode_base64($query)); } -sub decode_ref { #TODO: unused - return(MIME::Base64::decode_base64($_[0])); +sub decode_ref { #TODO: unused + return (MIME::Base64::decode_base64($_[0])); } sub access_log { - my $ip = shift; - my $username = shift; - my $time = shift; - my $rawrequest = shift; - my $http_status = shift; - my $bytes_transfered = shift; - my $request = shift; - my $useragent = shift; - return sprintf("%s - %s [%s +0100] \"%s\" %s %s \"%s\" \"%s\"", - $ip, - $username, - my_strftime("%d/%b/%Y:%H:%M:%S", $time), - $rawrequest, - $http_status, - $bytes_transfered, - $request, - $useragent - ); + my $ip = shift; + my $username = shift; + my $time = shift; + my $rawrequest = shift; + my $http_status = shift; + my $bytes_transfered = shift; + my $request = shift; + my $useragent = shift; + return sprintf("%s - %s [%s +0100] \"%s\" %s %s \"%s\" \"%s\"", $ip, $username, my_strftime("%d/%b/%Y:%H:%M:%S", $time), $rawrequest, $http_status, $bytes_transfered, $request, $useragent); } sub ReadConfig { - if(-e $CONFFILE) { - open(CONF, $CONFFILE); - while(<CONF>) { - chomp; - my($key, $value) = split(/ \= /, $_, 2); - $CONFIG{$key} = $value; - } - close(CONF); - - #Migrate settings - #v3.4.5 - $CONFIG{MAIL_FROM} = "autotimer@" . $CONFIG{MAIL_FROMDOMAIN} if($CONFIG{MAIL_FROM} =~ /from\@address.tld/); - - } else { - print "$CONFFILE doesn't exist. Please run \"$0 --config\"\n"; - print "Exiting!\n"; - exit(1); - #open(CONF, ">$CONFFILE"); - #for(keys(%CONFIG)) { - # print(CONF "$_ = $CONFIG{$_}\n"); - #} - #close(CONF); - #return(1); - } - return(0); + if (-e $CONFFILE) { + open(CONF, $CONFFILE); + while (<CONF>) { + chomp; + my ($key, $value) = split(/ \= /, $_, 2); + $CONFIG{$key} = $value; + } + close(CONF); + + #Migrate settings + #v3.4.5 + $CONFIG{MAIL_FROM} = "autotimer@" . $CONFIG{MAIL_FROMDOMAIN} if ($CONFIG{MAIL_FROM} =~ /from\@address.tld/); + + } else { + print "$CONFFILE doesn't exist. Please run \"$0 --config\"\n"; + print "Exiting!\n"; + exit(1); + + #open(CONF, ">$CONFFILE"); + #for(keys(%CONFIG)) { + # print(CONF "$_ = $CONFIG{$_}\n"); + #} + #close(CONF); + #return(1); + } + return (0); } sub Question { - my($quest, $default) = @_; - print("$quest [$default]: "); - my($answer); - chomp($answer = <STDIN>); - if($answer eq "") { - return($default); - } else { - return($answer); - } + my ($quest, $default) = @_; + print("$quest [$default]: "); + my ($answer); + chomp($answer = <STDIN>); + if ($answer eq "") { + return ($default); + } else { + return ($answer); + } } sub RemoveLeadingZero { - my($str) = @_; - while(substr($str, 0, 1) == 0) { - $str = substr($str, 1, (length($str) - 1)); - } - return($str); + my ($str) = @_; + while (substr($str, 0, 1) == 0) { + $str = substr($str, 1, (length($str) - 1)); + } + return ($str); } sub csvAdd { - my $csv = shift; - my $add = shift; + my $csv = shift; + my $add = shift; - my $found = 0; - for my $item (split(",", $csv)) { - $found = 1 if($item eq $add); - } - $csv = join(",", (split(",", $csv), $add)) if(!$found); - return($csv); + my $found = 0; + for my $item (split(",", $csv)) { + $found = 1 if ($item eq $add); + } + $csv = join(",", (split(",", $csv), $add)) if (!$found); + return ($csv); } sub csvRemove { - my $csv = shift; - my $remove = shift; - - my $newcsv = ""; - for my $item (split(",", $csv)) { - if($item ne $remove) { - my $found = 0; - if(defined($newcsv)) { - for my $dup (split(",", $newcsv)) { - $found = 1 if($dup eq $item); + my $csv = shift; + my $remove = shift; + + my $newcsv = ""; + for my $item (split(",", $csv)) { + if ($item ne $remove) { + my $found = 0; + if (defined($newcsv)) { + for my $dup (split(",", $newcsv)) { + $found = 1 if ($dup eq $item); + } + } + $newcsv = join(",", (split(",", $newcsv), $item)) if (!$found); } - } - $newcsv = join(",", (split(",", $newcsv), $item)) if(!$found); } - } - return($newcsv); + return ($newcsv); } sub Einheit { - my @einheiten = qw(MB GB TB); - my $einheit = 0; - my $zahl = shift; - while($zahl > 1024) { - $zahl /= 1024; - $einheit++; - } - return(sprintf("%1.*f", $einheit, $zahl) . $einheiten[$einheit]); + my @einheiten = qw(MB GB TB); + my $einheit = 0; + my $zahl = shift; + while ($zahl > 1024) { + $zahl /= 1024; + $einheit++; + } + return (sprintf("%1.*f", $einheit, $zahl) . $einheiten[$einheit]); } sub MBToMinutes { - my $mb = shift; - my $minutes = $mb / 25.75; - my $hours = $minutes / 60; - $minutes %= 60; - return(sprintf("%2d:%02d", $hours, $minutes)); + my $mb = shift; + my $minutes = $mb / 25.75; + my $hours = $minutes / 60; + $minutes %= 60; + return (sprintf("%2d:%02d", $hours, $minutes)); } sub VideoDiskFree { - $_ = join("", SendCMD("stat disk")); - if(/^(\d+)MB (\d+)MB (\d+)%.*?$/) { - return(Einheit($1), MBToMinutes($1), Einheit($2), MBToMinutes($2), $3); - } elsif(/^Command unrecognized: "stat"$/) { - #print "VDR doesnt know about this extension\n"; - } else { - print "Unknown response $_\n"; - } - return undef; + $_ = join("", SendCMD("stat disk")); + if (/^(\d+)MB (\d+)MB (\d+)%.*?$/) { + return (Einheit($1), MBToMinutes($1), Einheit($2), MBToMinutes($2), $3); + } elsif (/^Command unrecognized: "stat"$/) { + + #print "VDR doesnt know about this extension\n"; + } else { + print "Unknown response $_\n"; + } + return undef; } ############################################################################# # frontend ############################################################################# sub show_index { - my $template = TemplateNew("index.html"); - my $page; - if(defined($CONFIG{LOGINPAGE})) { - $page = $LOGINPAGES[$CONFIG{LOGINPAGE}]; - } else { - $page = $LOGINPAGES[0]; - } - my $vars = { - usercss => $UserCSS, - loginpage => "$MyURL?aktion=$page", - version => $VERSION, - host => $CONFIG{VDR_HOST} - }; - $template->param($vars); - my $output; - my $out = $template->output; - $Xtemplate->process(\$out, $vars, \$output) || return(header("500", "text/html", $Xtemplate->error())); - return(header("200", "text/html", $output)); + my $template = TemplateNew("index.html"); + my $page; + if (defined($CONFIG{LOGINPAGE})) { + $page = $LOGINPAGES[ $CONFIG{LOGINPAGE} ]; + } else { + $page = $LOGINPAGES[0]; + } + my $vars = { usercss => $UserCSS, + loginpage => "$MyURL?aktion=$page", + version => $VERSION, + host => $CONFIG{VDR_HOST} + }; + $template->param($vars); + my $output; + my $out = $template->output; + $Xtemplate->process(\$out, $vars, \$output) || return (header("500", "text/html", $Xtemplate->error())); + return (header("200", "text/html", $output)); } sub show_navi { - my $template = TemplateNew("navigation.html"); - my $vars = { - usercss => $UserCSS, - linvdr => $LINVDR - }; - $template->param($vars); - my $output; - my $out = $template->output; - $Xtemplate->process(\$out, $vars, \$output) || return(header("500", "text/html", $Xtemplate->error())); - return(header("200", "text/html", $output)); -} - -sub toolbar { #TODO: unused? - my $template = TemplateNew("toolbar.html"); - - my @channel; - for my $channel (@CHAN) { - # if its wished, display only wanted channels - if($CONFIG{CHANNELS_WANTED_PRG}) { - my $found = 0; - for my $n (split(",", $CONFIG{CHANNELS_WANTED})) { - ($found = 1) if($n eq $channel->{vdr_id}); - } - next if(!$found); - } - - # skip channels without EPG data - if(ChannelHasEPG($channel->{vdr_id})) { - push(@channel, { - name => $channel->{name}, - vdr_id => $channel->{vdr_id}, - #current => ($vdr_id == $channel->{vdr_id}) ? 1 : 0, - }); - } - } - - $template->param( - usercss => $UserCSS, - url => $MyURL, - chanloop => \@channel - ); - return(header("200", "text/html", $template->output)); -} - -sub show_top { #TODO: unused? - my $template = TemplateNew("top.html"); - return(header("200", "text/html", $template->output)); + my $template = TemplateNew("navigation.html"); + my $vars = { usercss => $UserCSS, + linvdr => $LINVDR + }; + $template->param($vars); + my $output; + my $out = $template->output; + $Xtemplate->process(\$out, $vars, \$output) || return (header("500", "text/html", $Xtemplate->error())); + return (header("200", "text/html", $output)); +} + +sub toolbar { #TODO: unused? + my $template = TemplateNew("toolbar.html"); + + my @channel; + for my $channel (@CHAN) { + + # if its wished, display only wanted channels + if ($CONFIG{CHANNELS_WANTED_PRG}) { + my $found = 0; + for my $n (split(",", $CONFIG{CHANNELS_WANTED})) { + ($found = 1) if ($n eq $channel->{vdr_id}); + } + next if (!$found); + } + + # skip channels without EPG data + if (ChannelHasEPG($channel->{vdr_id})) { + push( + @channel, + { name => $channel->{name}, + vdr_id => $channel->{vdr_id}, + + #current => ($vdr_id == $channel->{vdr_id}) ? 1 : 0, + } + ); + } + } + + $template->param(usercss => $UserCSS, + url => $MyURL, + chanloop => \@channel + ); + return (header("200", "text/html", $template->output)); +} + +sub show_top { #TODO: unused? + my $template = TemplateNew("top.html"); + return (header("200", "text/html", $template->output)); } sub prog_switch { - my $channel = $q->param("channel"); - if($channel) { - SendCMD("chan $channel"); - } - SendFile("bilder/spacer.gif"); + my $channel = $q->param("channel"); + if ($channel) { + SendCMD("chan $channel"); + } + SendFile("bilder/spacer.gif"); } sub prog_detail { - return if(UptoDate()); - my $vdr_id = $q->param("vdr_id"); - my $epg_id = $q->param("epg_id"); - - my($channel_name, $title, $subtitle, $start, $stop, $date, $text, @epgimages); - - if($vdr_id && $epg_id) { - for(@{$EPG{$vdr_id}}) { - #if($_->{id} == $epg_id) { #XXX - if($_->{event_id} == $epg_id) { - $channel_name = CGI::escapeHTML($_->{channel_name}); - $title = CGI::escapeHTML($_->{title}); - $subtitle = CGI::escapeHTML($_->{subtitle}); - $start = my_strftime("%H:%M", $_->{start}); - $stop = my_strftime("%H:%M", $_->{stop}); - $text = CGI::escapeHTML($_->{summary}); - $date = my_strftime("%A, %x", $_->{start}); - - # find epgimages - if($CONFIG{EPGIMAGES} && -d $CONFIG{EPGIMAGES}) { - for my $epgimage (<$CONFIG{EPGIMAGES}/$epg_id\[\._\]*>) { - $epgimage =~ s/.*\///g; - push(@epgimages, { image => "epg/" . $epgimage }); - } - } - last; - } - } - } - - my $displaytext = $text; - my $displaytitle = $title; - my $displaysubtitle = $subtitle; - my $find_title = $title; - - $displaytext =~ s/\n/<br \/>\n/g; - $displaytext =~ s/\|/<br \/>\n/g; - $displaytitle =~ s/\n/<br \/>\n/g; - $displaytitle =~ s/\|/<br \/>\n/g; - if($displaysubtitle) { - $displaysubtitle =~ s/\n/<br \/>\n/g; - $displaysubtitle =~ s/\|/<br \/>\n/g; - } - $find_title =~ s/^.*~\([^~]*\)/$1/; - - # Do not use prog_detail as referer. - # Use the referer we received. - my $referer = getReferer(); - my $recurl; - $recurl = sprintf("%s?aktion=timer_new_form&epg_id=%s&vdr_id=%s&referer=%s", $MyURL, $epg_id, $vdr_id, Encode_Referer($referer)) unless($referer =~ "timer_list"); - - my $template = TemplateNew("prog_detail.html"); - my $vars = { - usercss => $UserCSS, - title => $displaytitle ? $displaytitle : undef, - recurl => $recurl, - switchurl => sprintf("%s?aktion=prog_switch&channel=%s", $MyURL, $vdr_id), - channel_name => $channel_name, - subtitle => $displaysubtitle, - start => $start, - stop => $stop, - text => $displaytext ? $displaytext : undef, - date => $date, - find_title => uri_escape($find_title), - epgimages => \@epgimages - }; - $template->param($vars); - my $output; - my $out = $template->output; - $Xtemplate->process(\$out, $vars, \$output) || return(header("500", "text/html", $Xtemplate->error())); - return(header("200", "text/html", $output)); -} + return if (UptoDate()); + my $vdr_id = $q->param("vdr_id"); + my $epg_id = $q->param("epg_id"); + + my ($channel_name, $title, $subtitle, $start, $stop, $date, $text, @epgimages); + + if ($vdr_id && $epg_id) { + for (@{ $EPG{$vdr_id} }) { + + #if($_->{id} == $epg_id) { #XXX + if ($_->{event_id} == $epg_id) { + $channel_name = CGI::escapeHTML($_->{channel_name}); + $title = CGI::escapeHTML($_->{title}); + $subtitle = CGI::escapeHTML($_->{subtitle}); + $start = my_strftime("%H:%M", $_->{start}); + $stop = my_strftime("%H:%M", $_->{stop}); + $text = CGI::escapeHTML($_->{summary}); + $date = my_strftime("%A, %x", $_->{start}); + + # find epgimages + if ($CONFIG{EPGIMAGES} && -d $CONFIG{EPGIMAGES}) { + for my $epgimage (<$CONFIG{EPGIMAGES}/$epg_id\[\._\]*>) { + $epgimage =~ s/.*\///g; + push(@epgimages, { image => "epg/" . $epgimage }); + } + } + last; + } + } + } + my $displaytext = $text; + my $displaytitle = $title; + my $displaysubtitle = $subtitle; + my $find_title = $title; + + $displaytext =~ s/\n/<br \/>\n/g; + $displaytext =~ s/\|/<br \/>\n/g; + $displaytitle =~ s/\n/<br \/>\n/g; + $displaytitle =~ s/\|/<br \/>\n/g; + if ($displaysubtitle) { + $displaysubtitle =~ s/\n/<br \/>\n/g; + $displaysubtitle =~ s/\|/<br \/>\n/g; + } + $find_title =~ s/^.*~\([^~]*\)/$1/; + + # Do not use prog_detail as referer. + # Use the referer we received. + my $referer = getReferer(); + my $recurl; + $recurl = sprintf("%s?aktion=timer_new_form&epg_id=%s&vdr_id=%s&referer=%s", $MyURL, $epg_id, $vdr_id, Encode_Referer($referer)) unless ($referer =~ "timer_list"); + + my $template = TemplateNew("prog_detail.html"); + my $vars = { usercss => $UserCSS, + title => $displaytitle ? $displaytitle : undef, + recurl => $recurl, + switchurl => sprintf("%s?aktion=prog_switch&channel=%s", $MyURL, $vdr_id), + channel_name => $channel_name, + subtitle => $displaysubtitle, + start => $start, + stop => $stop, + text => $displaytext ? $displaytext : undef, + date => $date, + find_title => uri_escape($find_title), + epgimages => \@epgimages + }; + $template->param($vars); + my $output; + my $out = $template->output; + $Xtemplate->process(\$out, $vars, \$output) || return (header("500", "text/html", $Xtemplate->error())); + return (header("200", "text/html", $output)); +} ############################################################################# # program listing ############################################################################# sub prog_list { - return if(UptoDate()); - my ($vdr_id, $dummy); - ($vdr_id, $dummy) = split("#", $q->param("vdr_id"), 2) if($q->param("vdr_id")); - - # called without vdr_id, redirect to the first known channel - if(!$vdr_id) { - return(headerForward("$MyURL?aktion=prog_list&vdr_id=1")); - } - - my $myself = Encode_Referer($MyURL . "?" . $Query); - - # - my @channel; - for my $channel (@CHAN) { - # if its wished, display only wanted channels - if($CONFIG{CHANNELS_WANTED_PRG}) { - my $found = 0; - for my $n (split(",", $CONFIG{CHANNELS_WANTED})) { - ($found = 1) if($n eq $channel->{vdr_id}); - } - next if(!$found); - } - - # skip channels without EPG data - if(ChannelHasEPG($channel->{vdr_id})) { - push(@channel, { - name => $channel->{name}, - vdr_id => $channel->{vdr_id}, - current => ($vdr_id == $channel->{vdr_id}) ? 1 : 0, - }); - } - } - - # find the next/prev channel - my $ci = 0; - for(my $i = 0; $i <= $#channel; $i++) { - ($ci = $i) if($vdr_id == $channel[$i]->{vdr_id}); - } - my ($next_channel, $prev_channel); - ($prev_channel = $channel[$ci - 1]->{vdr_id}) if($ci > 0); - ($next_channel = $channel[$ci + 1]->{vdr_id}) if($ci < $#channel); - - # - my(@show, $progname, $cnumber); - my $day = 0; - for my $event (@{$EPG{$vdr_id}}) { - if(my_strftime("%d", $event->{start}) != $day) { - # new day - push(@show, { endd => 1 }) if(scalar(@show) > 0); - push(@show, { - title => $event->{channel_name} . " | " . my_strftime("%A, %x", $event->{start}), - newd => 1, - next_channel => $next_channel ? "$MyURL?aktion=prog_list&vdr_id=$next_channel" : undef, - prev_channel => $prev_channel ? "$MyURL?aktion=prog_list&vdr_id=$prev_channel" : undef, - }); - $day = strftime("%d", localtime($event->{start})); - } - push(@show, { - ssse => $event->{start}, - emit => my_strftime("%H:%M", $event->{start}), - duration => my_strftime("%H:%M", $event->{stop}), - title => CGI::escapeHTML($event->{title}), - subtitle => CGI::escapeHTML($event->{subtitle}), - recurl => sprintf("%s?aktion=timer_new_form&epg_id=%s&vdr_id=%s&referer=%s", $MyURL, $event->{event_id}, $event->{vdr_id}, $myself), - infurl => $event->{summary} ? sprintf("%s?aktion=prog_detail&epg_id=%s&vdr_id=%s&referer=%s", $MyURL, $event->{event_id}, $event->{vdr_id}, $myself) : undef, - newd => 0, - anchor => "id" . $event->{event_id} - }); - $progname = $event->{progname}; - $cnumber = $event->{cnumber}; - } - if(scalar(@show)) { - push(@show, { endd => 1 }); - } - - - # - my($template) = TemplateNew("prog_list.html"); - my $vars = { - usercss => $UserCSS, - url => $MyURL, - loop => \@show, - chanloop => \@channel, - progname => GetChannelDescByNumber($vdr_id), - switchurl => "$MyURL?aktion=prog_switch&channel=" . $vdr_id, - streamurl => $MyStreamBase . $CONFIG{TV_EXT} . "?aktion=live_stream&channel=" . $vdr_id, - stream_live_on => $CONFIG{ST_FUNC} && $CONFIG{ST_LIVE_ON}, - toolbarurl => "$MyURL?aktion=toolbar" - }; - $template->param($vars); - my $output; - my $out = $template->output; - $Xtemplate->process(\$out, $vars, \$output) || return(header("500", "text/html", $Xtemplate->error())); - return(header("200", "text/html", $output)); -} + return if (UptoDate()); + my ($vdr_id, $dummy); + ($vdr_id, $dummy) = split("#", $q->param("vdr_id"), 2) if ($q->param("vdr_id")); + + # called without vdr_id, redirect to the first known channel + if (!$vdr_id) { + return (headerForward("$MyURL?aktion=prog_list&vdr_id=1")); + } + + my $myself = Encode_Referer($MyURL . "?" . $Query); + + # + my @channel; + for my $channel (@CHAN) { + + # if its wished, display only wanted channels + if ($CONFIG{CHANNELS_WANTED_PRG}) { + my $found = 0; + for my $n (split(",", $CONFIG{CHANNELS_WANTED})) { + ($found = 1) if ($n eq $channel->{vdr_id}); + } + next if (!$found); + } + + # skip channels without EPG data + if (ChannelHasEPG($channel->{vdr_id})) { + push(@channel, + { name => $channel->{name}, + vdr_id => $channel->{vdr_id}, + current => ($vdr_id == $channel->{vdr_id}) ? 1 : 0, + } + ); + } + } + # find the next/prev channel + my $ci = 0; + for (my $i = 0 ; $i <= $#channel ; $i++) { + ($ci = $i) if ($vdr_id == $channel[$i]->{vdr_id}); + } + my ($next_channel, $prev_channel); + ($prev_channel = $channel[ $ci - 1 ]->{vdr_id}) if ($ci > 0); + ($next_channel = $channel[ $ci + 1 ]->{vdr_id}) if ($ci < $#channel); + # + my (@show, $progname, $cnumber); + my $day = 0; + for my $event (@{ $EPG{$vdr_id} }) { + if (my_strftime("%d", $event->{start}) != $day) { + + # new day + push(@show, { endd => 1 }) if (scalar(@show) > 0); + push(@show, + { title => $event->{channel_name} . " | " . my_strftime("%A, %x", $event->{start}), + newd => 1, + next_channel => $next_channel ? "$MyURL?aktion=prog_list&vdr_id=$next_channel" : undef, + prev_channel => $prev_channel ? "$MyURL?aktion=prog_list&vdr_id=$prev_channel" : undef, + } + ); + $day = strftime("%d", localtime($event->{start})); + } + push(@show, + { ssse => $event->{start}, + emit => my_strftime("%H:%M", $event->{start}), + duration => my_strftime("%H:%M", $event->{stop}), + title => CGI::escapeHTML($event->{title}), + subtitle => CGI::escapeHTML($event->{subtitle}), + recurl => sprintf("%s?aktion=timer_new_form&epg_id=%s&vdr_id=%s&referer=%s", $MyURL, $event->{event_id}, $event->{vdr_id}, $myself), + infurl => $event->{summary} ? sprintf("%s?aktion=prog_detail&epg_id=%s&vdr_id=%s&referer=%s", $MyURL, $event->{event_id}, $event->{vdr_id}, $myself) : undef, + newd => 0, + anchor => "id" . $event->{event_id} + } + ); + $progname = $event->{progname}; + $cnumber = $event->{cnumber}; + } + if (scalar(@show)) { + push(@show, { endd => 1 }); + } + # + my ($template) = TemplateNew("prog_list.html"); + my $vars = { usercss => $UserCSS, + url => $MyURL, + loop => \@show, + chanloop => \@channel, + progname => GetChannelDescByNumber($vdr_id), + switchurl => "$MyURL?aktion=prog_switch&channel=" . $vdr_id, + streamurl => $MyStreamBase . $CONFIG{TV_EXT} . "?aktion=live_stream&channel=" . $vdr_id, + stream_live_on => $CONFIG{ST_FUNC} && $CONFIG{ST_LIVE_ON}, + toolbarurl => "$MyURL?aktion=toolbar" + }; + $template->param($vars); + my $output; + my $out = $template->output; + $Xtemplate->process(\$out, $vars, \$output) || return (header("500", "text/html", $Xtemplate->error())); + return (header("200", "text/html", $output)); +} ############################################################################# # program listing 2 # "What's up today" extension. -# +# # Contributed by Thomas Blon, 6. Mar 2004 ############################################################################# sub prog_list2 { - return if(UptoDate()); - - my $current_day = my_strftime("%d"); - my $last_day = 0; - my $day = $current_day; - $day = $q->param("day") if ($q->param("day")); - - # - my $vdr_id; - my @channel; - my $myself = Encode_Referer($MyURL . "?" . $Query); - - for my $channel (@CHAN) { - # if its wished, display only wanted channels - if($CONFIG{CHANNELS_WANTED_PRG2}) { - my $found = 0; - for my $n (split(",", $CONFIG{CHANNELS_WANTED})) { - ($found = 1) if($n eq $channel->{vdr_id}); - } - next if(!$found); - } - - # skip channels without EPG data - if(ChannelHasEPG($channel->{vdr_id})) { - push(@channel, { - name => $channel->{name}, - vdr_id => $channel->{vdr_id} - }); - } - } - - my(@show, $progname, $cnumber); - - foreach (@channel) { # loop through all channels - $vdr_id = $_->{vdr_id}; - - # find the next/prev channel - my $ci = 0; - for(my $i = 0; $i <= $#channel; $i++) { - ($ci = $i) if($vdr_id == $channel[$i]->{vdr_id}); - } - my ($next_channel, $prev_channel); - ($prev_channel = $channel[$ci - 1]->{vdr_id}) if($ci > 0); - ($next_channel = $channel[$ci + 1]->{vdr_id}) if($ci < $#channel); - - my $dayflag = 0; - - for my $event (@{$EPG{$vdr_id}}) { - my $event_day = my_strftime("%d", $event->{start}); -# print("EVENT: " . $event->{title} . " - " . $event_day . "\n"); - if($event_day == $day) { - $dayflag = 1 if ($dayflag == 0); - } else { - $last_day = $event_day if ($event_day > $last_day); - $dayflag = 0; - } - - if($dayflag == 1) { - push(@show, { - title => $event->{channel_name} . " | " . my_strftime("%A, %x", $event->{start}), - newd => 1, - streamurl => $MyStreamBase . $CONFIG{TV_EXT} . "?aktion=live_stream&channel=" . $event->{vdr_id}, - proglink => "$MyURL?aktion=prog_list&vdr_id=" . $event->{vdr_id} - }); - - $dayflag++; - } - - if($dayflag == 2) { - push(@show, { - ssse => $event->{start}, - emit => my_strftime("%H:%M", $event->{start}), - duration => my_strftime("%H:%M", $event->{stop}), - title => CGI::escapeHTML($event->{title}), - subtitle => CGI::escapeHTML($event->{subtitle}), - recurl => sprintf("%s?aktion=timer_new_form&epg_id=%s&vdr_id=%s&referer=%s", $MyURL, $event->{event_id}, $event->{vdr_id}, $myself), - infurl => $event->{summary} ? sprintf("%s?aktion=prog_detail&epg_id=%s&vdr_id=%s&referer=%s", $MyURL, $event->{event_id}, $event->{vdr_id}, $myself) : undef, - newd => 0, - anchor => "id" . $event->{event_id} - }); - $progname = $event->{progname}; - $cnumber = $event->{cnumber}; - } - } - push(@show, { endd => 1 }); - } # end: for $vdr_id - - # - my($template) = TemplateNew("prog_list2.html"); - my $vars = { - title => $day == $current_day ? gettext("Playing Today") : ($day == $current_day + 1 ? gettext("Playing Tomorrow") : sprintf(gettext("Playing on the %d."), $day)), - usercss => $UserCSS, - url => $MyURL, - loop => \@show, - chanloop => \@channel, - progname => GetChannelDescByNumber($vdr_id), - switchurl => "$MyURL?aktion=prog_switch&channel=" . $vdr_id, - stream_live_on => $CONFIG{ST_FUNC} && $CONFIG{ST_LIVE_ON}, - prevdayurl => $day > $current_day ? "$MyURL?aktion=prog_list2&day=" . ($day - 1): undef, - nextdayurl => $last_day > $day ? "$MyURL?aktion=prog_list2&day=" . ($day + 1): undef, - toolbarurl => "$MyURL?aktion=toolbar" - }; - $template->param($vars); - my $output; - my $out = $template->output; - $Xtemplate->process(\$out, $vars, \$output) || return(header("500", "text/html", $Xtemplate->error())); - return(header("200", "text/html", $output)); -} + return if (UptoDate()); + + my $current_day = my_strftime("%d"); + my $last_day = 0; + my $day = $current_day; + $day = $q->param("day") if ($q->param("day")); + + # + my $vdr_id; + my @channel; + my $myself = Encode_Referer($MyURL . "?" . $Query); + + for my $channel (@CHAN) { + + # if its wished, display only wanted channels + if ($CONFIG{CHANNELS_WANTED_PRG2}) { + my $found = 0; + for my $n (split(",", $CONFIG{CHANNELS_WANTED})) { + ($found = 1) if ($n eq $channel->{vdr_id}); + } + next if (!$found); + } + + # skip channels without EPG data + if (ChannelHasEPG($channel->{vdr_id})) { + push(@channel, + { name => $channel->{name}, + vdr_id => $channel->{vdr_id} + } + ); + } + } + my (@show, $progname, $cnumber); + + foreach (@channel) { # loop through all channels + $vdr_id = $_->{vdr_id}; + + # find the next/prev channel + my $ci = 0; + for (my $i = 0 ; $i <= $#channel ; $i++) { + ($ci = $i) if ($vdr_id == $channel[$i]->{vdr_id}); + } + my ($next_channel, $prev_channel); + ($prev_channel = $channel[ $ci - 1 ]->{vdr_id}) if ($ci > 0); + ($next_channel = $channel[ $ci + 1 ]->{vdr_id}) if ($ci < $#channel); + + my $dayflag = 0; + + for my $event (@{ $EPG{$vdr_id} }) { + my $event_day = my_strftime("%d", $event->{start}); + + # print("EVENT: " . $event->{title} . " - " . $event_day . "\n"); + if ($event_day == $day) { + $dayflag = 1 if ($dayflag == 0); + } else { + $last_day = $event_day if ($event_day > $last_day); + $dayflag = 0; + } + + if ($dayflag == 1) { + push(@show, + { title => $event->{channel_name} . " | " . my_strftime("%A, %x", $event->{start}), + newd => 1, + streamurl => $MyStreamBase . $CONFIG{TV_EXT} . "?aktion=live_stream&channel=" . $event->{vdr_id}, + proglink => "$MyURL?aktion=prog_list&vdr_id=" . $event->{vdr_id} + } + ); + + $dayflag++; + } + + if ($dayflag == 2) { + push(@show, + { ssse => $event->{start}, + emit => my_strftime("%H:%M", $event->{start}), + duration => my_strftime("%H:%M", $event->{stop}), + title => CGI::escapeHTML($event->{title}), + subtitle => CGI::escapeHTML($event->{subtitle}), + recurl => sprintf("%s?aktion=timer_new_form&epg_id=%s&vdr_id=%s&referer=%s", $MyURL, $event->{event_id}, $event->{vdr_id}, $myself), + infurl => $event->{summary} ? sprintf("%s?aktion=prog_detail&epg_id=%s&vdr_id=%s&referer=%s", $MyURL, $event->{event_id}, $event->{vdr_id}, $myself) : undef, + newd => 0, + anchor => "id" . $event->{event_id} + } + ); + $progname = $event->{progname}; + $cnumber = $event->{cnumber}; + } + } + push(@show, { endd => 1 }); + } # end: for $vdr_id + + # + my ($template) = TemplateNew("prog_list2.html"); + my $vars = { + title => $day == $current_day ? gettext("Playing Today") : ($day == $current_day + 1 ? gettext("Playing Tomorrow") : sprintf(gettext("Playing on the %d."), $day)), + usercss => $UserCSS, + url => $MyURL, + loop => \@show, + chanloop => \@channel, + progname => GetChannelDescByNumber($vdr_id), + switchurl => "$MyURL?aktion=prog_switch&channel=" . $vdr_id, + stream_live_on => $CONFIG{ST_FUNC} && $CONFIG{ST_LIVE_ON}, + prevdayurl => $day > $current_day ? "$MyURL?aktion=prog_list2&day=" . ($day - 1) : undef, + nextdayurl => $last_day > $day ? "$MyURL?aktion=prog_list2&day=" . ($day + 1) : undef, + toolbarurl => "$MyURL?aktion=toolbar" + }; + $template->param($vars); + my $output; + my $out = $template->output; + $Xtemplate->process(\$out, $vars, \$output) || return (header("500", "text/html", $Xtemplate->error())); + return (header("200", "text/html", $output)); +} ############################################################################# # regular timers ############################################################################# sub timer_list { - return if(UptoDate()); - - # - my $desc; - if(!defined($q->param("desc"))) { - $desc = 1; - } else { - $q->param("desc") ? ($desc = 1) : ($desc = 0); - } - my $sortby = $q->param("sortby"); - ($sortby = "day") if(!$sortby); - - # - my @timer; - my @timer2; - my @days; - my $myself = Encode_Referer($MyURL . "?" . $Query); - - my ($TagAnfang, $TagEnde); - for my $timer (ParseTimer(0)) { - # VDR >= 1.3.24 reports if it's recording, so don't overwrite it here - if($VDRVERSION < 10324 && $timer->{recording} == 0 && $timer->{startsse} < time() && $timer->{stopsse} > time() && ($timer->{active} & 1)) { - $timer->{recording} = 1; - } - $timer->{active} = 0 unless($timer->{active} & 1); - - $timer->{delurl} = $MyURL . "?aktion=timer_delete&timer_id=" . $timer->{id} . "&sortby=" . $sortby . "&desc=" . $desc, - $timer->{modurl} = $MyURL . "?aktion=timer_new_form&timer_id=" . $timer->{id} . "&sortby=" . $sortby . "&desc=" . $desc, - $timer->{toggleurl} = sprintf("%s?aktion=timer_toggle&active=%s&id=%s&sortby=%s&desc=%s", $MyURL, ($timer->{active} & 1) ? 0 : 1, $timer->{id}, $sortby, $desc), - $timer->{dor} = my_strftime("%a %d.%m", $timer->{startsse}); #TODO: localize date - - $timer->{title} = CGI::escapeHTML($timer->{title}); - $TagAnfang=my_mktime(0,0,my_strftime("%d", $timer->{start}),my_strftime("%m", $timer->{start}),my_strftime("%Y", $timer->{start})); - $TagEnde=my_mktime(0,0,my_strftime("%d", $timer->{stop}),my_strftime("%m", $timer->{stop}),my_strftime("%Y", $timer->{stop})); - - $timer->{duration} = ($timer->{stop} - $timer->{start}) / 60; - $timer->{startlong} = ((my_mktime(my_strftime("%M", $timer->{start}),my_strftime("%H", $timer->{start}),my_strftime("%d", $timer->{start}),my_strftime("%m", $timer->{start}),my_strftime("%Y", $timer->{start})))-$TagAnfang)/60; - $timer->{stoplong} = ((my_mktime(my_strftime("%M", $timer->{stop}),my_strftime("%H", $timer->{stop}),my_strftime("%d", $timer->{stop}),my_strftime("%m", $timer->{stop}),my_strftime("%Y", $timer->{stop})))-$TagEnde)/60; - $timer->{starttime} = my_strftime("%y%m%d", $timer->{startsse}); - $timer->{stoptime} = my_strftime("%y%m%d", $timer->{stopsse}); - $timer->{sortfield} = $timer->{cdesc} . $timer->{startsse}; - $timer->{infurl} = $timer->{event_id} ? sprintf("%s?aktion=prog_detail&epg_id=%s&vdr_id=%s&referer=%s", $MyURL, $timer->{event_id}, $timer->{vdr_id}, $myself) : undef, - - $timer->{start} = my_strftime("%H:%M", $timer->{start}); - $timer->{stop} = my_strftime("%H:%M", $timer->{stop}); - $timer->{sortbyactive} = 1 if($sortby eq "active"); - $timer->{sortbychannel} = 1 if($sortby eq "channel"); - $timer->{sortbyname} = 1 if($sortby eq "name"); - $timer->{sortbystart} = 1 if($sortby eq "start"); - $timer->{sortbystop} = 1 if($sortby eq "stop"); - $timer->{sortbyday} = 1 if($sortby eq "day"); - - $timer->{transponder} = get_transponder_from_vdrid($timer->{vdr_id}); - $timer->{ca} = get_ca_from_vdrid($timer->{vdr_id}); - push(@timer, $timer); - } - @timer = sort({ $a->{startsse} <=> $b->{startsse} } @timer); - - # - if($CONFIG{RECORDINGS}) { - my($ii, $jj, $timer, $last); - for($ii = 0; $ii < @timer; $ii++) { - if($timer[$ii]->{first} == -1 || $timer[$ii]->{first} == 1) { - $last = $ii; - } - - # Liste der benutzten Transponder - my @Transponder = $timer[$ii]->{transponder}; - $timer[$ii]->{collision} = 0; - - for($jj = 0; $jj < $ii; $jj++) { - if($timer[$ii]->{startsse} >= $timer[$jj]->{startsse} && - $timer[$ii]->{startsse} < $timer[$jj]->{stopsse}) { - if($timer[$ii]->{active} && $timer[$jj]->{active}) { - # Timer kollidieren zeitlich. Pruefen, ob die Timer evtl. auf - # gleichem Transponder oder CAM liegen und daher ohne Probleme - # aufgenommen werden koennen - Log(LOG_DEBUG, sprintf("Kollission: %s (%s, %s) -- %s (%s, %s)\n", - substr($timer[$ii]->{title},0,15), $timer[$ii]->{vdr_id}, - $timer[$ii]->{transponder}, - $timer[$ii]->{ca}, - substr($timer[$jj]->{title},0,15), $timer[$jj]->{vdr_id}, - $timer[$jj]->{transponder}, - $timer[$jj]->{ca})); - - if($timer[$ii]->{vdr_id} != $timer[$jj]->{vdr_id} && - $timer[$ii]->{ca} == - $timer[$jj]->{ca} && - $timer[$ii]->{ca} >= 100) { - # Beide Timer laufen auf dem gleichen CAM auf verschiedenen - # Kanaelen, davon kann nur einer aufgenommen werden - Log(LOG_DEBUG, "Beide Kanaele gleiches CAM"); - ($timer[$ii]->{collision}) = $CONFIG{RECORDINGS}; - # Nur Kosmetik: Transponderliste vervollstaendigen - push(@Transponder, $timer[$jj]->{transponder}); + return if (UptoDate()); + + # + my $desc; + if (!defined($q->param("desc"))) { + $desc = 1; + } else { + $q->param("desc") ? ($desc = 1) : ($desc = 0); + } + my $sortby = $q->param("sortby"); + ($sortby = "day") if (!$sortby); + + # + my @timer; + my @timer2; + my @days; + my $myself = Encode_Referer($MyURL . "?" . $Query); + + my ($TagAnfang, $TagEnde); + for my $timer (ParseTimer(0)) { + + # VDR >= 1.3.24 reports if it's recording, so don't overwrite it here + if ($VDRVERSION < 10324 && $timer->{recording} == 0 && $timer->{startsse} < time() && $timer->{stopsse} > time() && ($timer->{active} & 1)) { + $timer->{recording} = 1; + } + $timer->{active} = 0 unless ($timer->{active} & 1); + + $timer->{delurl} = $MyURL . "?aktion=timer_delete&timer_id=" . $timer->{id} . "&sortby=" . $sortby . "&desc=" . $desc, + $timer->{modurl} = $MyURL . "?aktion=timer_new_form&timer_id=" . $timer->{id} . "&sortby=" . $sortby . "&desc=" . $desc, + $timer->{toggleurl} = sprintf("%s?aktion=timer_toggle&active=%s&id=%s&sortby=%s&desc=%s", $MyURL, ($timer->{active} & 1) ? 0 : 1, $timer->{id}, $sortby, $desc), + $timer->{dor} = my_strftime("%a %d.%m", $timer->{startsse}); #TODO: localize date + + $timer->{title} = CGI::escapeHTML($timer->{title}); + $TagAnfang = my_mktime(0, 0, my_strftime("%d", $timer->{start}), my_strftime("%m", $timer->{start}), my_strftime("%Y", $timer->{start})); + $TagEnde = my_mktime(0, 0, my_strftime("%d", $timer->{stop}), my_strftime("%m", $timer->{stop}), my_strftime("%Y", $timer->{stop})); + + $timer->{duration} = ($timer->{stop} - $timer->{start}) / 60; + $timer->{startlong} = ((my_mktime(my_strftime("%M", $timer->{start}), my_strftime("%H", $timer->{start}), my_strftime("%d", $timer->{start}), my_strftime("%m", $timer->{start}), my_strftime("%Y", $timer->{start}))) - $TagAnfang) / 60; + $timer->{stoplong} = ((my_mktime(my_strftime("%M", $timer->{stop}), my_strftime("%H", $timer->{stop}), my_strftime("%d", $timer->{stop}), my_strftime("%m", $timer->{stop}), my_strftime("%Y", $timer->{stop}))) - $TagEnde) / 60; + $timer->{starttime} = my_strftime("%y%m%d", $timer->{startsse}); + $timer->{stoptime} = my_strftime("%y%m%d", $timer->{stopsse}); + $timer->{sortfield} = $timer->{cdesc} . $timer->{startsse}; + $timer->{infurl} = $timer->{event_id} ? sprintf("%s?aktion=prog_detail&epg_id=%s&vdr_id=%s&referer=%s", $MyURL, $timer->{event_id}, $timer->{vdr_id}, $myself) : undef, + + $timer->{start} = my_strftime("%H:%M", $timer->{start}); + $timer->{stop} = my_strftime("%H:%M", $timer->{stop}); + $timer->{sortbyactive} = 1 if ($sortby eq "active"); + $timer->{sortbychannel} = 1 if ($sortby eq "channel"); + $timer->{sortbyname} = 1 if ($sortby eq "name"); + $timer->{sortbystart} = 1 if ($sortby eq "start"); + $timer->{sortbystop} = 1 if ($sortby eq "stop"); + $timer->{sortbyday} = 1 if ($sortby eq "day"); + + $timer->{transponder} = get_transponder_from_vdrid($timer->{vdr_id}); + $timer->{ca} = get_ca_from_vdrid($timer->{vdr_id}); + push(@timer, $timer); + } + @timer = sort({ $a->{startsse} <=> $b->{startsse} } @timer); + + # + if ($CONFIG{RECORDINGS}) { + my ($ii, $jj, $timer, $last); + for ($ii = 0 ; $ii < @timer ; $ii++) { + if ($timer[$ii]->{first} == -1 || $timer[$ii]->{first} == 1) { + $last = $ii; + } + + # Liste der benutzten Transponder + my @Transponder = $timer[$ii]->{transponder}; + $timer[$ii]->{collision} = 0; + + for ($jj = 0 ; $jj < $ii ; $jj++) { + if ( $timer[$ii]->{startsse} >= $timer[$jj]->{startsse} + && $timer[$ii]->{startsse} < $timer[$jj]->{stopsse}) + { + if ($timer[$ii]->{active} && $timer[$jj]->{active}) { + + # Timer kollidieren zeitlich. Pruefen, ob die Timer evtl. auf + # gleichem Transponder oder CAM liegen und daher ohne Probleme + # aufgenommen werden koennen + Log(LOG_DEBUG, sprintf("Kollission: %s (%s, %s) -- %s (%s, %s)\n", substr($timer[$ii]->{title}, 0, 15), $timer[$ii]->{vdr_id}, $timer[$ii]->{transponder}, $timer[$ii]->{ca}, substr($timer[$jj]->{title}, 0, 15), $timer[$jj]->{vdr_id}, $timer[$jj]->{transponder}, $timer[$jj]->{ca})); + + if ( $timer[$ii]->{vdr_id} != $timer[$jj]->{vdr_id} + && $timer[$ii]->{ca} == $timer[$jj]->{ca} + && $timer[$ii]->{ca} >= 100) + { + + # Beide Timer laufen auf dem gleichen CAM auf verschiedenen + # Kanaelen, davon kann nur einer aufgenommen werden + Log(LOG_DEBUG, "Beide Kanaele gleiches CAM"); + ($timer[$ii]->{collision}) = $CONFIG{RECORDINGS}; + + # Nur Kosmetik: Transponderliste vervollstaendigen + push(@Transponder, $timer[$jj]->{transponder}); + } else { + + # "grep" prueft die Bedingung fuer jedes Element, daher den + # Transponder vorher zwischenspeichern -- ist effizienter + my $t = $timer[$jj]->{transponder}; + if (scalar(grep($_ eq $t, @Transponder)) == 0) { + ($timer[$ii]->{collision})++; + push(@Transponder, $timer[$jj]->{transponder}); + } + } + } + } + } + } + splice(@timer, $last + 1); + for ($ii = 0 ; $ii < @timer ; $ii++) { + $timer[$ii]->{critical} = $timer[$ii]->{collision} >= $CONFIG{RECORDINGS}; + if ($timer[$ii]->{critical} > 0) { + for ($jj = $ii - 1 ; $jj >= 0 ; $jj--) { + if ($timer[$jj]->{stopsse} > $timer[$ii]->{startsse}) { + $timer[$jj]->{critical} = 1; + } else { + last; + } + } + } + $timer[$ii]->{collision} = $timer[$ii]->{collision} >= ($CONFIG{RECORDINGS} - 1); + if ($timer[$ii]->{collision} > 0) { + for ($jj = $ii - 1 ; $jj >= 0 ; $jj--) { + if ($timer[$jj]->{stopsse} > $timer[$ii]->{startsse}) { + $timer[$jj]->{collision} = 1; + } else { + last; + } + } + } + $timer[$ii]->{collision} |= ($timer[$ii]->{ca} >= 100); + } + } + + # + my ($ii, $jj, $kk, $current, $title); + + for ($ii = 0 ; $ii < @timer ; $ii++) { + if ($ii == 0) { + if (!defined($q->param("timer"))) { + $current = my_strftime("%y%m%d", $timer[$ii]->{startsse}); + my $current_day = my_strftime("%y%m%d", time()); + $current = $current_day if ($current < $current_day); + $title = my_strftime("%A, %x", $timer[$ii]->{startsse}); } else { - # "grep" prueft die Bedingung fuer jedes Element, daher den - # Transponder vorher zwischenspeichern -- ist effizienter - my $t = $timer[$jj]->{transponder}; - if(scalar(grep($_ eq $t, @Transponder)) == 0) { - ($timer[$ii]->{collision})++; - push(@Transponder, $timer[$jj]->{transponder}); - } + $current = $q->param("timer"); + $kk = my_mktime(0, 0, substr($current, 4, 2), substr($current, 2, 2) - 1, "20" . substr($current, 0, 2)); + $title = my_strftime("%A, %x", $kk); } - } - } - } - } - splice(@timer, $last + 1); - for ($ii = 0; $ii < @timer; $ii++) { - $timer[$ii]->{critical} = $timer[$ii]->{collision} >= $CONFIG{RECORDINGS}; - if ($timer[$ii]->{critical} > 0) { - for ($jj = $ii - 1; $jj >= 0; $jj--) { - if ($timer[$jj]->{stopsse} > $timer[$ii]->{startsse}) { - $timer[$jj]->{critical} = 1; - } - else { - last; - } - } - } - $timer[$ii]->{collision} = $timer[$ii]->{collision} >= ($CONFIG{RECORDINGS} - 1); - if ($timer[$ii]->{collision} > 0) { - for ($jj = $ii - 1; $jj >= 0; $jj--) { - if ($timer[$jj]->{stopsse} > $timer[$ii]->{startsse}) { - $timer[$jj]->{collision} = 1; - } - else { + } + + $jj = 0; + for ($kk = 0 ; $kk < @days ; $kk++) { + if ($days[$kk]->{day} == my_strftime("%d.%m", $timer[$ii]->{startsse})) { + $jj = 1; + last; + } + } + if ($jj == 0) { + push(@days, + { day => my_strftime("%d.%m", $timer[$ii]->{startsse}), + sortfield => my_strftime("%y%m%d", $timer[$ii]->{startsse}), + current => ($current == my_strftime("%y%m%d", $timer[$ii]->{startsse})) ? 1 : 0, + } + ); + } + + $jj = 0; + for ($kk = 0 ; $kk < @days ; $kk++) { + if ($days[$kk]->{day} == my_strftime("%d.%m", $timer[$ii]->{stopsse})) { + $jj = 1; + last; + } + } + if ($jj == 0) { + push(@days, + { day => my_strftime("%d.%m", $timer[$ii]->{stopsse}), + sortfield => my_strftime("%y%m%d", $timer[$ii]->{stopsse}), + current => ($current == my_strftime("%y%m%d", $timer[$ii]->{stopsse})) ? 1 : 0, + } + ); + } + } + + @days = sort({ $a->{sortfield} <=> $b->{sortfield} } @days); + my $prev_day; + my $next_day; + my $cur_day; + foreach (@days) { + if ($_->{current}) { + $cur_day = $_->{sortfield}; + next; + } + if ($cur_day) { + $next_day = $_->{sortfield}; last; - } - } - } - $timer[$ii]->{collision} |= ($timer[$ii]->{ca} >= 100); - } - } - - # - my($ii, $jj, $kk, $current, $title); - - for ($ii = 0; $ii < @timer; $ii++) - { - if($ii==0) - { - if(!defined($q->param("timer"))) - { - $current=my_strftime("%y%m%d", $timer[$ii]->{startsse}); - my $current_day = my_strftime("%y%m%d",time()); - $current=$current_day if($current < $current_day); - $title=my_strftime("%A, %x", $timer[$ii]->{startsse}); - } - else - { - $current=$q->param("timer"); - $kk = my_mktime(0,0,substr($current, 4, 2),substr($current, 2, 2)-1,"20".substr($current, 0, 2)); - $title=my_strftime("%A, %x", $kk); - } - } - - $jj=0; - for ($kk = 0; $kk < @days; $kk++) - { - if($days[$kk]->{day} == my_strftime("%d.%m", $timer[$ii]->{startsse})) - { - $jj=1; - last; - } - } - if($jj==0) { - push(@days, { - day => my_strftime("%d.%m", $timer[$ii]->{startsse}), - sortfield => my_strftime("%y%m%d", $timer[$ii]->{startsse}), - current => ($current == my_strftime("%y%m%d", $timer[$ii]->{startsse})) ? 1 : 0, - }); - } - - $jj=0; - for ($kk = 0; $kk < @days; $kk++) - { - if($days[$kk]->{day} == my_strftime("%d.%m", $timer[$ii]->{stopsse})) - { - $jj=1; - last; - } - } - if($jj==0) { - push(@days, { - day => my_strftime("%d.%m", $timer[$ii]->{stopsse}), - sortfield => my_strftime("%y%m%d", $timer[$ii]->{stopsse}), - current => ($current == my_strftime("%y%m%d", $timer[$ii]->{stopsse})) ? 1 : 0, - }); - } - } - - @days = sort({ $a->{sortfield} <=> $b->{sortfield} } @days); - my $prev_day; - my $next_day; - my $cur_day; - foreach (@days) { - if($_->{current}) { - $cur_day = $_->{sortfield}; - next; - } - if($cur_day) { - $next_day=$_->{sortfield}; - last; - } else { - $prev_day=$_->{sortfield}; - } - } - - # - if($sortby eq "active") { - if(!$desc) { - @timer = sort({ $b->{active} <=> $a->{active} } @timer); - } else { - @timer = sort({ $a->{active} <=> $b->{active} } @timer); - } - } elsif($sortby eq "channel") { - if(!$desc) { - @timer = sort({ lc($b->{cdesc}) cmp lc($a->{cdesc}) } @timer); - } else { - @timer = sort({ lc($a->{cdesc}) cmp lc($b->{cdesc}) } @timer); - } - } elsif($sortby eq "name") { - if(!$desc) { - @timer = sort({ lc($b->{title}) cmp lc($a->{title}) } @timer); - } else { - @timer = sort({ lc($a->{title}) cmp lc($b->{title}) } @timer); - } - } elsif($sortby eq "start") { - if(!$desc) { - @timer = sort({ $b->{start} <=> $a->{start} } @timer); - } else { - @timer = sort({ $a->{start} <=> $b->{start} } @timer); - } - } elsif($sortby eq "stop") { - if(!$desc) { - @timer = sort({ $b->{stop} <=> $a->{stop} } @timer); - } else { - @timer = sort({ $a->{stop} <=> $b->{stop} } @timer); - } - } elsif($sortby eq "day") { - if(!$desc) { - @timer = sort({ $b->{startsse} <=> $a->{startsse} } @timer); - } else { - @timer = sort({ $a->{startsse} <=> $b->{startsse} } @timer); - } - } - my $cur_desc = $desc; - $desc ? ($desc = 0) : ($desc = 1); - @timer2=@timer; - @timer2=sort({ lc($a->{sortfield}) cmp lc($b->{sortfield}) } @timer2); - - my $template = TemplateNew("timer_list.html"); - my $vars = { - sortbydayurl => "$MyURL?aktion=timer_list&sortby=day&desc=" . (($sortby eq "day") ? $desc : $cur_desc), - sortbychannelurl => "$MyURL?aktion=timer_list&sortby=channel&desc=" . (($sortby eq "channel") ? $desc : $cur_desc), - sortbynameurl => "$MyURL?aktion=timer_list&sortby=name&desc=" . (($sortby eq "name") ? $desc : $cur_desc), - sortbyactiveurl => "$MyURL?aktion=timer_list&sortby=active&desc=" . (($sortby eq "active") ? $desc : $cur_desc), - sortbystarturl => "$MyURL?aktion=timer_list&sortby=start&desc=" . (($sortby eq "start") ? $desc : $cur_desc), - sortbystopurl => "$MyURL?aktion=timer_list&sortby=stop&desc=" . (($sortby eq "stop") ? $desc : $cur_desc), - sortbyday => ($sortby eq "day") ? 1 : 0, - sortbychannel => ($sortby eq "channel") ? 1 : 0, - sortbyname => ($sortby eq "name") ? 1 : 0, - sortbyactive => ($sortby eq "active") ? 1 : 0, - sortbystart => ($sortby eq "start") ? 1 : 0, - sortbystop => ($sortby eq "stop") ? 1 : 0, - sortby => $sortby, - desc => $desc, - cur_desc => $cur_desc, - timer_loop => \@timer, - timers => \@timer2, - timers2 => \@timer2, - day_loop => \@days, - url => $MyURL, - help_url => HelpURL("timer_list"), - current => $current, - title => $title, - usercss => $UserCSS, - activateurl => sprintf("%s?aktion=timer_toggle&active=1&sortby=%s&desc=%s", $MyURL, ,$sortby, $cur_desc), - inactivateurl => sprintf("%s?aktion=timer_toggle&active=0&sortby=%s&desc=%s", $MyURL, ,$sortby, $cur_desc), - prevdayurl => $prev_day ? sprintf("%s?aktion=timer_list&active=0&sortby=%s&desc=%s&timer=%s", $MyURL, ,$sortby, $cur_desc, $prev_day) : undef, - nextdayurl => $next_day ? sprintf("%s?aktion=timer_list&active=0&sortby=%s&desc=%s&timer=%s", $MyURL, ,$sortby, $cur_desc, $next_day) : undef, - config => \%CONFIG - }; - - $template->param($vars); - my $output; - my $out = $template->output; - $Xtemplate->process(\$out, $vars, \$output) || return(header("500", "text/html", $Xtemplate->error())); - return(header("200", "text/html", $output)); + } else { + $prev_day = $_->{sortfield}; + } + } + + # + if ($sortby eq "active") { + if (!$desc) { + @timer = sort({ $b->{active} <=> $a->{active} } @timer); + } else { + @timer = sort({ $a->{active} <=> $b->{active} } @timer); + } + } elsif ($sortby eq "channel") { + if (!$desc) { + @timer = sort({ lc($b->{cdesc}) cmp lc($a->{cdesc}) } @timer); + } else { + @timer = sort({ lc($a->{cdesc}) cmp lc($b->{cdesc}) } @timer); + } + } elsif ($sortby eq "name") { + if (!$desc) { + @timer = sort({ lc($b->{title}) cmp lc($a->{title}) } @timer); + } else { + @timer = sort({ lc($a->{title}) cmp lc($b->{title}) } @timer); + } + } elsif ($sortby eq "start") { + if (!$desc) { + @timer = sort({ $b->{start} <=> $a->{start} } @timer); + } else { + @timer = sort({ $a->{start} <=> $b->{start} } @timer); + } + } elsif ($sortby eq "stop") { + if (!$desc) { + @timer = sort({ $b->{stop} <=> $a->{stop} } @timer); + } else { + @timer = sort({ $a->{stop} <=> $b->{stop} } @timer); + } + } elsif ($sortby eq "day") { + if (!$desc) { + @timer = sort({ $b->{startsse} <=> $a->{startsse} } @timer); + } else { + @timer = sort({ $a->{startsse} <=> $b->{startsse} } @timer); + } + } + my $cur_desc = $desc; + $desc ? ($desc = 0) : ($desc = 1); + @timer2 = @timer; + @timer2 = sort({ lc($a->{sortfield}) cmp lc($b->{sortfield}) } @timer2); + + my $template = TemplateNew("timer_list.html"); + my $vars = { sortbydayurl => "$MyURL?aktion=timer_list&sortby=day&desc=" . (($sortby eq "day") ? $desc : $cur_desc), + sortbychannelurl => "$MyURL?aktion=timer_list&sortby=channel&desc=" . (($sortby eq "channel") ? $desc : $cur_desc), + sortbynameurl => "$MyURL?aktion=timer_list&sortby=name&desc=" . (($sortby eq "name") ? $desc : $cur_desc), + sortbyactiveurl => "$MyURL?aktion=timer_list&sortby=active&desc=" . (($sortby eq "active") ? $desc : $cur_desc), + sortbystarturl => "$MyURL?aktion=timer_list&sortby=start&desc=" . (($sortby eq "start") ? $desc : $cur_desc), + sortbystopurl => "$MyURL?aktion=timer_list&sortby=stop&desc=" . (($sortby eq "stop") ? $desc : $cur_desc), + sortbyday => ($sortby eq "day") ? 1 : 0, + sortbychannel => ($sortby eq "channel") ? 1 : 0, + sortbyname => ($sortby eq "name") ? 1 : 0, + sortbyactive => ($sortby eq "active") ? 1 : 0, + sortbystart => ($sortby eq "start") ? 1 : 0, + sortbystop => ($sortby eq "stop") ? 1 : 0, + sortby => $sortby, + desc => $desc, + cur_desc => $cur_desc, + timer_loop => \@timer, + timers => \@timer2, + timers2 => \@timer2, + day_loop => \@days, + url => $MyURL, + help_url => HelpURL("timer_list"), + current => $current, + title => $title, + usercss => $UserCSS, + activateurl => sprintf("%s?aktion=timer_toggle&active=1&sortby=%s&desc=%s", $MyURL,, $sortby, $cur_desc), + inactivateurl => sprintf("%s?aktion=timer_toggle&active=0&sortby=%s&desc=%s", $MyURL,, $sortby, $cur_desc), + prevdayurl => $prev_day ? sprintf("%s?aktion=timer_list&active=0&sortby=%s&desc=%s&timer=%s", $MyURL,, $sortby, $cur_desc, $prev_day) : undef, + nextdayurl => $next_day ? sprintf("%s?aktion=timer_list&active=0&sortby=%s&desc=%s&timer=%s", $MyURL,, $sortby, $cur_desc, $next_day) : undef, + config => \%CONFIG + }; + + $template->param($vars); + my $output; + my $out = $template->output; + $Xtemplate->process(\$out, $vars, \$output) || return (header("500", "text/html", $Xtemplate->error())); + return (header("200", "text/html", $output)); } sub timer_toggle { - UptoDate(); - my $id = $q->param("id"); - my $sortby = $q->param("sortby"); - my $desc = $q->param("desc"); - if($id) { - my $active = $q->param("active"); - SendCMD(sprintf("modt %s %s", $id, $active ? "on" : "off")); - # XXX check return - } else { - my $active; - $active = "on" if($q->param("timer_active")); - $active = "off" if($q->param("timer_inactive")); - if($active) { - my @sorted; - for($q->param) { - if(/xxxx_(.*)/) { - push(@sorted, $1); - } - } - @sorted = sort({ $b <=> $a } @sorted); - for my $t (@sorted) { - SendCMD(sprintf("modt %s %s", $t, $active)); - # XXX check return - } - CloseSocket(); - } - } - return(headerForward(RedirectToReferer("$MyURL?aktion=timer_list&sortby=$sortby&desc=$desc"))); + UptoDate(); + my $id = $q->param("id"); + my $sortby = $q->param("sortby"); + my $desc = $q->param("desc"); + if ($id) { + my $active = $q->param("active"); + SendCMD(sprintf("modt %s %s", $id, $active ? "on" : "off")); + + # XXX check return + } else { + my $active; + $active = "on" if ($q->param("timer_active")); + $active = "off" if ($q->param("timer_inactive")); + if ($active) { + my @sorted; + for ($q->param) { + if (/xxxx_(.*)/) { + push(@sorted, $1); + } + } + @sorted = sort({ $b <=> $a } @sorted); + for my $t (@sorted) { + SendCMD(sprintf("modt %s %s", $t, $active)); + + # XXX check return + } + CloseSocket(); + } + } + return (headerForward(RedirectToReferer("$MyURL?aktion=timer_list&sortby=$sortby&desc=$desc"))); } sub timer_new_form { - UptoDate(); - - my $epg_id = $q->param("epg_id"); - my $vdr_id = $q->param("vdr_id"); - my $timer_id = $q->param("timer_id"); - - my $this_event; - if($epg_id) { # new timer - my $this = EPG_getEntry($vdr_id, $epg_id); - $this_event->{active} = 1; - $this_event->{event_id} = $this->{event_id}; - $this_event->{start} = $this->{start} - ($CONFIG{TM_MARGIN_BEGIN} * 60); - $this_event->{stop} = $this->{stop} + ($CONFIG{TM_MARGIN_END} * 60); - $this_event->{dor} = $this->{dor}; - $this_event->{title} = $this->{title}; - # Do NOT append EPG summary if VDR >= 10344 as this will be done by VDR itself - $this_event->{summary}= $this->{summary} if($VDRVERSION < 10344); - $this_event->{vdr_id} = $this->{vdr_id}; - } elsif($timer_id) { # edit existing timer - $this_event = ParseTimer(0, $timer_id); - } else { # none of the above - $this_event->{start} = time(); - $this_event->{stop} = 0; - $this_event->{active} = 1; - $this_event->{vdr_id} = 1; - } - - my @channels; - for my $channel (@CHAN) { - ($channel->{vdr_id} == $this_event->{vdr_id}) ? ($channel->{current} = 1) : ($channel->{current} = 0); - push(@channels, $channel); - } - - # determine referer (redirect to where we come from) - my $ref = getReferer(); - - my $displaysummary = $this_event->{summary}; - $displaysummary =~ s/\|/\n/g if($displaysummary); - my $displaytitle = $this_event->{title}; - $displaytitle =~ s/"/\"/g; - - my $at_epg = $this_event->{event_id} > 0 ? can_do_eventid_autotimer($this_event->{vdr_id}) : 0; - - my $vars = { - usercss => $UserCSS, - url => $MyURL, - active => $this_event->{active} & 1, - event_id => $this_event->{event_id}, - starth => my_strftime("%H", $this_event->{start}), - startm => my_strftime("%M", $this_event->{start}), - bstart => $this_event->{bstart}, - stoph => $this_event->{stop} ? my_strftime("%H", $this_event->{stop}) : "00", - stopm => $this_event->{stop} ? my_strftime("%M", $this_event->{stop}) : "00", - bstop => $this_event->{bstop}, - vps => $this_event->{active} & 4, - dor => ($this_event->{dor} && (length($this_event->{dor}) == 7 || length($this_event->{dor}) == 10 || length($this_event->{dor}) == 18)) ? $this_event->{dor} : my_strftime("%d", $this_event->{start}), - prio => $this_event->{prio} ? $this_event->{prio} : $CONFIG{TM_PRIORITY}, - lft => $this_event->{lft} ? $this_event->{lft} : $CONFIG{TM_LIFETIME}, - title => $displaytitle, - summary => $displaysummary, - pattern => $this_event->{pattern}, - timer_id => $timer_id ? $timer_id : 0, - channels => \@channels, - newtimer => $timer_id ? 0 : 1, - autotimer => $timer_id ? $this_event->{autotimer} : $at_epg ? $AT_BY_EVENT_ID : $AT_BY_TIME, - at_epg => $at_epg, - referer => $ref ? Encode_Referer($ref) : undef, - help_url => HelpURL("timer_new") - }; - - my $template = TemplateNew("timer_new.html"); - $template->param($vars); - - my $output; - my $out = $template->output; - $Xtemplate->process(\$out, $vars, \$output) || return(header("500", "text/html", $Xtemplate->error())); - return(header("200", "text/html", $output)); + UptoDate(); + + my $epg_id = $q->param("epg_id"); + my $vdr_id = $q->param("vdr_id"); + my $timer_id = $q->param("timer_id"); + + my $this_event; + if ($epg_id) { # new timer + my $this = EPG_getEntry($vdr_id, $epg_id); + $this_event->{active} = 1; + $this_event->{event_id} = $this->{event_id}; + $this_event->{start} = $this->{start} - ($CONFIG{TM_MARGIN_BEGIN} * 60); + $this_event->{stop} = $this->{stop} + ($CONFIG{TM_MARGIN_END} * 60); + $this_event->{dor} = $this->{dor}; + $this_event->{title} = $this->{title}; + + # Do NOT append EPG summary if VDR >= 10344 as this will be done by VDR itself + $this_event->{summary} = $this->{summary} if ($VDRVERSION < 10344); + $this_event->{vdr_id} = $this->{vdr_id}; + } elsif ($timer_id) { # edit existing timer + $this_event = ParseTimer(0, $timer_id); + } else { # none of the above + $this_event->{start} = time(); + $this_event->{stop} = 0; + $this_event->{active} = 1; + $this_event->{vdr_id} = 1; + } + + my @channels; + for my $channel (@CHAN) { + ($channel->{vdr_id} == $this_event->{vdr_id}) ? ($channel->{current} = 1) : ($channel->{current} = 0); + push(@channels, $channel); + } + + # determine referer (redirect to where we come from) + my $ref = getReferer(); + + my $displaysummary = $this_event->{summary}; + $displaysummary =~ s/\|/\n/g if ($displaysummary); + my $displaytitle = $this_event->{title}; + $displaytitle =~ s/"/\"/g; + + my $at_epg = $this_event->{event_id} > 0 ? can_do_eventid_autotimer($this_event->{vdr_id}) : 0; + + my $vars = { usercss => $UserCSS, + url => $MyURL, + active => $this_event->{active} & 1, + event_id => $this_event->{event_id}, + starth => my_strftime("%H", $this_event->{start}), + startm => my_strftime("%M", $this_event->{start}), + bstart => $this_event->{bstart}, + stoph => $this_event->{stop} ? my_strftime("%H", $this_event->{stop}) : "00", + stopm => $this_event->{stop} ? my_strftime("%M", $this_event->{stop}) : "00", + bstop => $this_event->{bstop}, + vps => $this_event->{active} & 4, + dor => ($this_event->{dor} && (length($this_event->{dor}) == 7 || length($this_event->{dor}) == 10 || length($this_event->{dor}) == 18)) ? $this_event->{dor} : my_strftime("%d", $this_event->{start}), + prio => $this_event->{prio} ? $this_event->{prio} : $CONFIG{TM_PRIORITY}, + lft => $this_event->{lft} ? $this_event->{lft} : $CONFIG{TM_LIFETIME}, + title => $displaytitle, + summary => $displaysummary, + pattern => $this_event->{pattern}, + timer_id => $timer_id ? $timer_id : 0, + channels => \@channels, + newtimer => $timer_id ? 0 : 1, + autotimer => $timer_id ? $this_event->{autotimer} : $at_epg ? $AT_BY_EVENT_ID : $AT_BY_TIME, + at_epg => $at_epg, + referer => $ref ? Encode_Referer($ref) : undef, + help_url => HelpURL("timer_new") + }; + + my $template = TemplateNew("timer_new.html"); + $template->param($vars); + + my $output; + my $out = $template->output; + $Xtemplate->process(\$out, $vars, \$output) || return (header("500", "text/html", $Xtemplate->error())); + return (header("200", "text/html", $output)); } sub timer_add { - my $timer_id = $q->param("timer_id"); - - my $data; - - if($q->param("save")) { - my $value = $q->param("starth"); - if($value =~ /\d+/ && $value < 24 && $value >= 0) { - $data->{start} = sprintf("%02d", $value); - } else { - print "Help!\n"; - $data->{start} = "00"; - } - $value = $q->param("startm"); - if($value =~ /\d+/ && $value < 60 && $value >= 0) { - $data->{start} .= sprintf("%02d", $value); - } else { - print "Help!\n"; - $data->{start} .= "00"; - } - - $value = $q->param("stoph"); - if($value =~ /\d+/ && $value < 24 && $value >= 0) { - $data->{stop} = sprintf("%02d", $value); - } else { - print "Help!\n"; - $data->{stop} = "00"; - } - $value = $q->param("stopm"); - if($value =~ /\d+/ && $value < 60 && $value >= 0) { - $data->{stop} .= sprintf("%02d", $value); - } else { - print "Help!\n"; - $data->{stop} .= "00"; - } - - $data->{active} = $q->param("active"); - $data->{autotimer} = $q->param("autotimer"); - $data->{event_id} = $q->param("event_id"); - - $data->{prio} = $1 if($q->param("prio") =~ /(\d+)/); - $data->{lft} = $1 if($q->param("lft") =~ /(\d+)/); - $data->{dor} = $1 if($q->param("dor") =~ /([0-9MTWTFSS@\-]+)/); - $data->{channel} = $1 if($q->param("channel") =~ /(\d+)/); - - $data->{active} |= 4 if($q->param("vps") && $q->param("vps") == 1); - - if(length($q->param("title")) > 0) { - $data->{title} = $q->param("title"); - } else { - $data->{title} = GetChannelDescByNumber($data->{channel}) if ($data->{channel}); - } - - if(length($q->param("summary")) > 0) { - $data->{summary} = $q->param("summary"); -# $data->{summary} =~ s/\://g; # summary may have colons (man vdr.5) - $data->{summary} =~ s/\r//g; - $data->{summary} =~ s/\n/|/g; - } - - my $dor = $data->{dor}; - if(length($data->{dor}) == 7 || length($data->{dor}) == 10 || length($data->{dor}) == 18) { - # dummy - $dor = 1; - } - $data->{startsse} = my_mktime(substr($data->{start}, 2, 2), - substr($data->{start}, 0, 2), - $dor, - (my_strftime("%m") - 1), - my_strftime("%Y")); - - $data->{stopsse} = my_mktime(substr($data->{stop}, 2, 2), - substr($data->{stop}, 0, 2), - $data->{stop} > $data->{start} ? $dor : $dor + 1, - (my_strftime("%m") - 1), - my_strftime("%Y")); - - $data->{event_id} = 0 unless(can_do_eventid_autotimer($data->{channel})); - - my $return = ProgTimer( - $timer_id, - $data->{active}, - $data->{event_id}, - $data->{channel}, - $data->{startsse}, - $data->{stopsse}, - $data->{prio}, - $data->{lft}, - $data->{title}, - append_timer_metadata($data->{summary}, $data->{event_id}, $data->{autotimer}, $CONFIG{TM_MARGIN_BEGIN}, $CONFIG{TM_MARGIN_END}, undef), - ($dor == 1) ? $data->{dor} : undef - ); - - } - - my $ref = getReferer(); - if($ref) { - return(headerForward($ref)); - } else { - return(headerForward("$MyURL?aktion=timer_list")); - } + my $timer_id = $q->param("timer_id"); + + my $data; + + if ($q->param("save")) { + my $value = $q->param("starth"); + if ($value =~ /\d+/ && $value < 24 && $value >= 0) { + $data->{start} = sprintf("%02d", $value); + } else { + print "Help!\n"; + $data->{start} = "00"; + } + $value = $q->param("startm"); + if ($value =~ /\d+/ && $value < 60 && $value >= 0) { + $data->{start} .= sprintf("%02d", $value); + } else { + print "Help!\n"; + $data->{start} .= "00"; + } + + $value = $q->param("stoph"); + if ($value =~ /\d+/ && $value < 24 && $value >= 0) { + $data->{stop} = sprintf("%02d", $value); + } else { + print "Help!\n"; + $data->{stop} = "00"; + } + $value = $q->param("stopm"); + if ($value =~ /\d+/ && $value < 60 && $value >= 0) { + $data->{stop} .= sprintf("%02d", $value); + } else { + print "Help!\n"; + $data->{stop} .= "00"; + } + + $data->{active} = $q->param("active"); + $data->{autotimer} = $q->param("autotimer"); + $data->{event_id} = $q->param("event_id"); + + $data->{prio} = $1 if ($q->param("prio") =~ /(\d+)/); + $data->{lft} = $1 if ($q->param("lft") =~ /(\d+)/); + $data->{dor} = $1 if ($q->param("dor") =~ /([0-9MTWTFSS@\-]+)/); + $data->{channel} = $1 if ($q->param("channel") =~ /(\d+)/); + + $data->{active} |= 4 if ($q->param("vps") && $q->param("vps") == 1); + + if (length($q->param("title")) > 0) { + $data->{title} = $q->param("title"); + } else { + $data->{title} = GetChannelDescByNumber($data->{channel}) if ($data->{channel}); + } + + if (length($q->param("summary")) > 0) { + $data->{summary} = $q->param("summary"); + + #$data->{summary} =~ s/\://g; # summary may have colons (man vdr.5) + $data->{summary} =~ s/\r//g; + $data->{summary} =~ s/\n/|/g; + } + + my $dor = $data->{dor}; + if (length($data->{dor}) == 7 || length($data->{dor}) == 10 || length($data->{dor}) == 18) { + + # dummy + $dor = 1; + } + $data->{startsse} = my_mktime(substr($data->{start}, 2, 2), substr($data->{start}, 0, 2), $dor, (my_strftime("%m") - 1), my_strftime("%Y")); + + $data->{stopsse} = my_mktime(substr($data->{stop}, 2, 2), substr($data->{stop}, 0, 2), $data->{stop} > $data->{start} ? $dor : $dor + 1, (my_strftime("%m") - 1), my_strftime("%Y")); + + $data->{event_id} = 0 unless (can_do_eventid_autotimer($data->{channel})); + + my $return = ProgTimer($timer_id, $data->{active}, $data->{event_id}, $data->{channel}, $data->{startsse}, $data->{stopsse}, $data->{prio}, $data->{lft}, $data->{title}, append_timer_metadata($data->{summary}, $data->{event_id}, $data->{autotimer}, $CONFIG{TM_MARGIN_BEGIN}, $CONFIG{TM_MARGIN_END}, undef), ($dor == 1) ? $data->{dor} : undef); + + } + + my $ref = getReferer(); + if ($ref) { + return (headerForward($ref)); + } else { + return (headerForward("$MyURL?aktion=timer_list")); + } } sub timer_delete { - my($timer_id) = $q->param('timer_id'); - if($timer_id) { - my($result) = SendCMD("delt $timer_id"); - if($result =~ /Timer "$timer_id" is recording/i) { - SendCMD("modt $timer_id off"); - sleep(1); - SendCMD("delt $timer_id"); - } - } else { - my @sorted; - for($q->param) { - if(/xxxx_(.*)/) { - push(@sorted, $1); - } - } - @sorted = sort({ $b <=> $a } @sorted); - for my $t (@sorted) { - my($result) = SendCMD("delt $t"); - if($result =~ /Timer "$t" is recording/i) { - SendCMD("modt $t off"); - sleep(1); - SendCMD("delt $t"); - } + my ($timer_id) = $q->param('timer_id'); + if ($timer_id) { + my ($result) = SendCMD("delt $timer_id"); + if ($result =~ /Timer "$timer_id" is recording/i) { + SendCMD("modt $timer_id off"); + sleep(1); + SendCMD("delt $timer_id"); + } + } else { + my @sorted; + for ($q->param) { + if (/xxxx_(.*)/) { + push(@sorted, $1); + } + } + @sorted = sort({ $b <=> $a } @sorted); + for my $t (@sorted) { + my ($result) = SendCMD("delt $t"); + if ($result =~ /Timer "$t" is recording/i) { + SendCMD("modt $t off"); + sleep(1); + SendCMD("delt $t"); + } + } + CloseSocket(); } - CloseSocket(); - } - return(headerForward(RedirectToReferer("$MyURL?aktion=timer_list"))); + return (headerForward(RedirectToReferer("$MyURL?aktion=timer_list"))); } sub rec_stream { - my($id) = $q->param('id'); - my($i, $title, $newtitle); - my $data; - my $f; - my(@tmp, $dirname, $name, $parent, @files); - my( $date, $time, $day, $month, $hour, $minute); - my $c; - - for(SendCMD("lstr")) { - ($i, $date, $time, $title) = split(/ +/, $_, 4); - last if($id == $i); - } - $time = substr($time, 0, 5); # needed for wareagel-patch - if ( $id == $i) { - chomp($title); - ($day, $month)= split( /\./, $date); - ($hour, $minute)= split( /:/, $time); - # escape characters - if( $CONFIG{VDRVFAT} > 0 ) { - for ( $i=0 ;$ i < length($title); $i++) { - $c = substr($title,$i,1); - unless ($c =~ /[öäüßÖÄÜA-Za-z0123456789_!@\$%&()+,.\-;=~ ]/) { - $newtitle.= sprintf( "#%02X", ord( $c )); - } else { - $newtitle.= $c; - } - } - } else { - for ( $i=0 ;$ i < length($title); $i++) { - $c = substr($title,$i,1); - if ($c eq "/" ) { - $newtitle.= "\x02"; - } elsif ($c eq "\\" ) { - $newtitle.= "\x01"; - } else { - $newtitle.= $c; - } - } - } - $title=$newtitle; - $title =~ s/ /_/g; - $title =~ s/~/\//g; - print("REC: find $CONFIG{VIDEODIR}/ -regex \"$CONFIG{VIDEODIR}/$title\_*/\\(\_/\\)?....-$month-$day\\.$hour.$minute\\...\\...\\.rec/...\\.vdr\"\n"); - @files= `find $CONFIG{VIDEODIR}/ -regex "$CONFIG{VIDEODIR}/$title\_*/\\(\_/\\)?....-$month-$day\\.$hour.$minute\\...\\...\\.rec/...\\.vdr" | sort -r`; - foreach (@files) { - chomp; - print("FOUND: ($_)\n"); - $_ =~ s/$CONFIG{VIDEODIR}/$CONFIG{ST_VIDEODIR}/; - $_ =~ s/\n//g; - $data= $CONFIG{ST_URL}."$_\n$data"; - } - } - return(header("200", $CONFIG{REC_MIMETYPE}, $data)); + my ($id) = $q->param('id'); + my ($i, $title, $newtitle); + my $data; + my $f; + my (@tmp, $dirname, $name, $parent, @files); + my ($date, $time, $day, $month, $hour, $minute); + my $c; + + for (SendCMD("lstr")) { + ($i, $date, $time, $title) = split(/ +/, $_, 4); + last if ($id == $i); + } + $time = substr($time, 0, 5); # needed for wareagel-patch + if ($id == $i) { + chomp($title); + ($day, $month) = split(/\./, $date); + ($hour, $minute) = split(/:/, $time); + + # escape characters + if ($CONFIG{VDRVFAT} > 0) { + for ($i = 0 ; $i < length($title) ; $i++) { + $c = substr($title, $i, 1); + unless ($c =~ /[öäüßÖÄÜA-Za-z0123456789_!@\$%&()+,.\-;=~ ]/) { + $newtitle .= sprintf("#%02X", ord($c)); + } else { + $newtitle .= $c; + } + } + } else { + for ($i = 0 ; $i < length($title) ; $i++) { + $c = substr($title, $i, 1); + if ($c eq "/") { + $newtitle .= "\x02"; + } elsif ($c eq "\\") { + $newtitle .= "\x01"; + } else { + $newtitle .= $c; + } + } + } + $title = $newtitle; + $title =~ s/ /_/g; + $title =~ s/~/\//g; + print("REC: find $CONFIG{VIDEODIR}/ -regex \"$CONFIG{VIDEODIR}/$title\_*/\\(\_/\\)?....-$month-$day\\.$hour.$minute\\...\\...\\.rec/...\\.vdr\"\n"); + @files = `find $CONFIG{VIDEODIR}/ -regex "$CONFIG{VIDEODIR}/$title\_*/\\(\_/\\)?....-$month-$day\\.$hour.$minute\\...\\...\\.rec/...\\.vdr" | sort -r`; + foreach (@files) { + chomp; + print("FOUND: ($_)\n"); + $_ =~ s/$CONFIG{VIDEODIR}/$CONFIG{ST_VIDEODIR}/; + $_ =~ s/\n//g; + $data = $CONFIG{ST_URL} . "$_\n$data"; + } + } + return (header("200", $CONFIG{REC_MIMETYPE}, $data)); } sub getReferer { - my $epg_id = $q->param("epg_id"); - my $ref = $q->param("referer"); - if ($ref) { - $ref = Decode_Referer($ref); - if ($ref =~ /#/) { - return $ref; - } else { - return sprintf("%s%s", $ref, $epg_id ? "#id$epg_id" : ""); - } - } else { - return undef; - } + my $epg_id = $q->param("epg_id"); + my $ref = $q->param("referer"); + if ($ref) { + $ref = Decode_Referer($ref); + if ($ref =~ /#/) { + return $ref; + } else { + return sprintf("%s%s", $ref, $epg_id ? "#id$epg_id" : ""); + } + } else { + return undef; + } } ############################################################################# # live streaming ############################################################################# sub live_stream { - my $channel = $q->param("channel"); - my ($data, $ifconfig, $ip); - - if ( $CONFIG{VDR_HOST} eq "localhost") { - $ifconfig=`/sbin/ifconfig eth0`; - if ( $ifconfig =~ /inet.+:(\d+\.\d+\.\d+\.\d+)\s+Bcast/) { - $ip=$1; - } else { - $ip=`hostname`; - } - } else { - $ip= $CONFIG{VDR_HOST}; - } - $data="http://$ip:$CONFIG{ST_STREAMDEV_PORT}/$channel"; - return(header("200", $CONFIG{TV_MIMETYPE}, $data)); + my $channel = $q->param("channel"); + my ($data, $ifconfig, $ip); + + if ($CONFIG{VDR_HOST} eq "localhost") { + $ifconfig = `/sbin/ifconfig eth0`; + if ($ifconfig =~ /inet.+:(\d+\.\d+\.\d+\.\d+)\s+Bcast/) { + $ip = $1; + } else { + $ip = `hostname`; + } + } else { + $ip = $CONFIG{VDR_HOST}; + } + $data = "http://$ip:$CONFIG{ST_STREAMDEV_PORT}/$channel"; + return (header("200", $CONFIG{TV_MIMETYPE}, $data)); } ############################################################################# # automatic timers ############################################################################# sub at_timer_list { - return if(UptoDate()); - - # - my $desc; - if(!defined($q->param("desc"))) { - $desc = 1; - } else { - $q->param("desc") ? ($desc = 1) : ($desc = 0); - } - my $sortby = $q->param("sortby"); - ($sortby = "pattern") if(!$sortby); - - # - my @at; - my $id = 0; - for(AT_Read()) { - $id++; - if($_->{start}) { - $_->{start} = substr($_->{start}, 0, 2) . ":" . substr($_->{start}, 2, 5); - } - if($_->{stop}) { - $_->{stop} = substr($_->{stop}, 0, 2) . ":" . substr($_->{stop}, 2, 5); - } - $_->{pattern_js} = $_->{pattern}; - $_->{pattern} = CGI::escapeHTML($_->{pattern}); - $_->{pattern_js} =~ s/\'/\\\'/g; - $_->{pattern_js} =~ s/\"/"/g; - $_->{modurl} = $MyURL . "?aktion=at_timer_edit&id=$id&sortby=$sortby&desc=$desc"; - $_->{delurl} = $MyURL . "?aktion=at_timer_delete&id=$id&sortby=$sortby&desc=$desc"; - $_->{prio} = $_->{prio} ? $_->{prio} : $CONFIG{AT_PRIORITY}; - $_->{lft} = $_->{lft} ? $_->{lft} : $CONFIG{AT_LIFETIME}; - $_->{id} = $id; - $_->{proglink} = sprintf("%s?aktion=prog_list&vdr_id=%s", $MyURL, $_->{channel}); - $_->{channel} = GetChannelDescByNumber($_->{channel}); - $_->{sortbyactive} = 1 if($sortby eq "active"); - $_->{sortbychannel} = 1 if($sortby eq "channel"); - $_->{sortbypattern} = 1 if($sortby eq "pattern"); - $_->{sortbystart} = 1 if($sortby eq "start"); - $_->{sortbystop} = 1 if($sortby eq "stop"); - $_->{toggleurl} = sprintf("%s?aktion=at_timer_toggle&active=%s&id=%s&sortby=%s&desc=%s", $MyURL, ($_->{active} & 1) ? 0 : 1, $_->{id}, $sortby, $desc), - push(@at, $_); - } - my @timer = sort({ lc($a->{pattern}) cmp lc($b->{pattern}) } @at); - - # - if($sortby eq "active") { - if(!$desc) { - @timer = sort({ $b->{active} <=> $a->{active} } @timer); - } else { - @timer = sort({ $a->{active} <=> $b->{active} } @timer); - } - } elsif($sortby eq "channel") { - if(!$desc) { - @timer = sort({ lc($b->{channel}) cmp lc($a->{channel}) } @timer); - } else { - @timer = sort({ lc($a->{channel}) cmp lc($b->{channel}) } @timer); - } - } elsif($sortby eq "pattern") { - if(!$desc) { - @timer = sort({ lc($b->{pattern}) cmp lc($a->{pattern}) } @timer); - } else { - @timer = sort({ lc($a->{pattern}) cmp lc($b->{pattern}) } @timer); - } - } elsif($sortby eq "start") { - if(!$desc) { - @timer = sort({ $b->{start} <=> $a->{start} } @timer); - } else { - @timer = sort({ $a->{start} <=> $b->{start} } @timer); - } - } elsif($sortby eq "stop") { - if(!$desc) { - @timer = sort({ $b->{stop} <=> $a->{stop} } @timer); - } else { - @timer = sort({ $a->{stop} <=> $b->{stop} } @timer); - } - } - my $cur_desc = $desc; - $desc ? ($desc = 0) : ($desc = 1); - - my $template = TemplateNew("at_timer_list.html"); - my $vars = { - usercss => $UserCSS, - sortbychannelurl => "$MyURL?aktion=at_timer_list&sortby=channel&desc=" . (($sortby eq "channel") ? $desc : $cur_desc), - sortbypatternurl => "$MyURL?aktion=at_timer_list&sortby=pattern&desc=" . (($sortby eq "pattern") ? $desc : $cur_desc), - sortbyactiveurl => "$MyURL?aktion=at_timer_list&sortby=active&desc=" . (($sortby eq "active") ? $desc : $cur_desc), - sortbystarturl => "$MyURL?aktion=at_timer_list&sortby=start&desc=" . (($sortby eq "start") ? $desc : $cur_desc), - sortbystopurl => "$MyURL?aktion=at_timer_list&sortby=stop&desc=" . (($sortby eq "stop") ? $desc : $cur_desc), - sortbychannel => ($sortby eq "channel") ? 1 : 0, - sortbypattern => ($sortby eq "pattern") ? 1 : 0, - sortbyactive => ($sortby eq "active") ? 1 : 0, - sortbystart => ($sortby eq "start") ? 1 : 0, - sortbystop => ($sortby eq "stop") ? 1 : 0, - desc => $desc, - at_timer_loop => \@timer, - at_timer_loop2 => \@timer, - url => $MyURL, - help_url => HelpURL("at_timer_list"), - config => \%CONFIG - }; - $template->param($vars); - my $output; - my $out = $template->output; - $Xtemplate->process(\$out, $vars, \$output) || return(header("500", "text/html", $Xtemplate->error())); - return(header("200", "text/html", $output)); + return if (UptoDate()); + + # + my $desc; + if (!defined($q->param("desc"))) { + $desc = 1; + } else { + $q->param("desc") ? ($desc = 1) : ($desc = 0); + } + my $sortby = $q->param("sortby"); + ($sortby = "pattern") if (!$sortby); + + # + my @at; + my $id = 0; + for (AT_Read()) { + $id++; + if ($_->{start}) { + $_->{start} = substr($_->{start}, 0, 2) . ":" . substr($_->{start}, 2, 5); + } + if ($_->{stop}) { + $_->{stop} = substr($_->{stop}, 0, 2) . ":" . substr($_->{stop}, 2, 5); + } + $_->{pattern_js} = $_->{pattern}; + $_->{pattern} = CGI::escapeHTML($_->{pattern}); + $_->{pattern_js} =~ s/\'/\\\'/g; + $_->{pattern_js} =~ s/\"/"/g; + $_->{modurl} = $MyURL . "?aktion=at_timer_edit&id=$id&sortby=$sortby&desc=$desc"; + $_->{delurl} = $MyURL . "?aktion=at_timer_delete&id=$id&sortby=$sortby&desc=$desc"; + $_->{prio} = $_->{prio} ? $_->{prio} : $CONFIG{AT_PRIORITY}; + $_->{lft} = $_->{lft} ? $_->{lft} : $CONFIG{AT_LIFETIME}; + $_->{id} = $id; + $_->{proglink} = sprintf("%s?aktion=prog_list&vdr_id=%s", $MyURL, $_->{channel}); + $_->{channel} = GetChannelDescByNumber($_->{channel}); + $_->{sortbyactive} = 1 if ($sortby eq "active"); + $_->{sortbychannel} = 1 if ($sortby eq "channel"); + $_->{sortbypattern} = 1 if ($sortby eq "pattern"); + $_->{sortbystart} = 1 if ($sortby eq "start"); + $_->{sortbystop} = 1 if ($sortby eq "stop"); + $_->{toggleurl} = sprintf("%s?aktion=at_timer_toggle&active=%s&id=%s&sortby=%s&desc=%s", $MyURL, ($_->{active} & 1) ? 0 : 1, $_->{id}, $sortby, $desc), push(@at, $_); + } + my @timer = sort({ lc($a->{pattern}) cmp lc($b->{pattern}) } @at); + + # + if ($sortby eq "active") { + if (!$desc) { + @timer = sort({ $b->{active} <=> $a->{active} } @timer); + } else { + @timer = sort({ $a->{active} <=> $b->{active} } @timer); + } + } elsif ($sortby eq "channel") { + if (!$desc) { + @timer = sort({ lc($b->{channel}) cmp lc($a->{channel}) } @timer); + } else { + @timer = sort({ lc($a->{channel}) cmp lc($b->{channel}) } @timer); + } + } elsif ($sortby eq "pattern") { + if (!$desc) { + @timer = sort({ lc($b->{pattern}) cmp lc($a->{pattern}) } @timer); + } else { + @timer = sort({ lc($a->{pattern}) cmp lc($b->{pattern}) } @timer); + } + } elsif ($sortby eq "start") { + if (!$desc) { + @timer = sort({ $b->{start} <=> $a->{start} } @timer); + } else { + @timer = sort({ $a->{start} <=> $b->{start} } @timer); + } + } elsif ($sortby eq "stop") { + if (!$desc) { + @timer = sort({ $b->{stop} <=> $a->{stop} } @timer); + } else { + @timer = sort({ $a->{stop} <=> $b->{stop} } @timer); + } + } + my $cur_desc = $desc; + $desc ? ($desc = 0) : ($desc = 1); + + my $template = TemplateNew("at_timer_list.html"); + my $vars = { usercss => $UserCSS, + sortbychannelurl => "$MyURL?aktion=at_timer_list&sortby=channel&desc=" . (($sortby eq "channel") ? $desc : $cur_desc), + sortbypatternurl => "$MyURL?aktion=at_timer_list&sortby=pattern&desc=" . (($sortby eq "pattern") ? $desc : $cur_desc), + sortbyactiveurl => "$MyURL?aktion=at_timer_list&sortby=active&desc=" . (($sortby eq "active") ? $desc : $cur_desc), + sortbystarturl => "$MyURL?aktion=at_timer_list&sortby=start&desc=" . (($sortby eq "start") ? $desc : $cur_desc), + sortbystopurl => "$MyURL?aktion=at_timer_list&sortby=stop&desc=" . (($sortby eq "stop") ? $desc : $cur_desc), + sortbychannel => ($sortby eq "channel") ? 1 : 0, + sortbypattern => ($sortby eq "pattern") ? 1 : 0, + sortbyactive => ($sortby eq "active") ? 1 : 0, + sortbystart => ($sortby eq "start") ? 1 : 0, + sortbystop => ($sortby eq "stop") ? 1 : 0, + desc => $desc, + at_timer_loop => \@timer, + at_timer_loop2 => \@timer, + url => $MyURL, + help_url => HelpURL("at_timer_list"), + config => \%CONFIG + }; + $template->param($vars); + my $output; + my $out = $template->output; + $Xtemplate->process(\$out, $vars, \$output) || return (header("500", "text/html", $Xtemplate->error())); + return (header("200", "text/html", $output)); } sub at_timer_toggle { - UptoDate(); - my $active = $q->param("active"); - my $id = $q->param("id"); - my $sortby = $q->param("sortby"); - my $desc = $q->param("desc"); + UptoDate(); + my $active = $q->param("active"); + my $id = $q->param("id"); + my $sortby = $q->param("sortby"); + my $desc = $q->param("desc"); - my(@at, $z); + my (@at, $z); - for(AT_Read()) { - $z++; - if($z == $id) { - $_->{active} = $active; - } - push(@at, $_); - } - AT_Write(@at); + for (AT_Read()) { + $z++; + if ($z == $id) { + $_->{active} = $active; + } + push(@at, $_); + } + AT_Write(@at); - return(headerForward(RedirectToReferer("$MyURL?aktion=at_timer_list&sortby=$sortby&desc=$desc"))); + return (headerForward(RedirectToReferer("$MyURL?aktion=at_timer_list&sortby=$sortby&desc=$desc"))); } sub at_timer_edit { - my $id = $q->param("id"); - - my @at = AT_Read(); - - # - my @chans; - for my $chan (@CHAN) { - if($CONFIG{CHANNELS_WANTED_AUTOTIMER}) { - my $found = 0; - for my $n (split(",", $CONFIG{CHANNELS_WANTED})) { - ($found = 1) if($n eq $chan->{vdr_id}); - } - next if(!$found); - } - if($chan->{vdr_id}) { - $chan->{cur} = ($chan->{vdr_id} == $at[$id-1]->{channel}) ? 1 : 0; - } - push(@chans, $chan); - } - - my $pattern = $at[$id-1]->{pattern}; - $pattern =~ s/"/\"/g, - my $template = TemplateNew("at_timer_new.html"); - my $vars = { - usercss => $UserCSS, - channels => \@chans, - id => $id, - url => $MyURL, - prio => $at[$id-1]->{prio} ? $at[$id-1]->{prio} : $CONFIG{AT_PRIORITY}, - lft => $at[$id-1]->{lft} ? $at[$id-1]->{lft} : $CONFIG{AT_LIFETIME}, - active => $at[$id-1]->{active}, - done => $at[$id-1]->{done}, - episode => $at[$id-1]->{episode}, - pattern => $pattern, - starth => (length($at[$id-1]->{start}) >= 4) ? substr($at[$id-1]->{start}, 0, 2) : undef, - startm => (length($at[$id-1]->{start}) >= 4) ? substr($at[$id-1]->{start}, 2, 5) : undef, - stoph => (length($at[$id-1]->{stop}) >= 4) ? substr($at[$id-1]->{stop}, 0, 2) : undef, - stopm => (length($at[$id-1]->{stop}) >= 4) ? substr($at[$id-1]->{stop}, 2, 5) : undef, - title => ($at[$id-1]->{section} & 1) ? 1 : 0, - subtitle => ($at[$id-1]->{section} & 2) ? 1 : 0, - description => ($at[$id-1]->{section} & 4) ? 1 : 0, - directory => $at[$id-1]->{directory}, - newtimer => 0, - (map {$_=>$at[$id-1]->{weekdays}->{$_}} qw (wday_mon wday_tue wday_wed wday_thu wday_fri wday_sat wday_sun)), - help_url => HelpURL("at_timer_new") - }; - - $template->param($vars); - my $output; - my $out = $template->output; - $Xtemplate->process(\$out, $vars, \$output) || return(header("500", "text/html", $Xtemplate->error())); - return(header("200", "text/html", $output)); + my $id = $q->param("id"); + + my @at = AT_Read(); + + # + my @chans; + for my $chan (@CHAN) { + if ($CONFIG{CHANNELS_WANTED_AUTOTIMER}) { + my $found = 0; + for my $n (split(",", $CONFIG{CHANNELS_WANTED})) { + ($found = 1) if ($n eq $chan->{vdr_id}); + } + next if (!$found); + } + if ($chan->{vdr_id}) { + $chan->{cur} = ($chan->{vdr_id} == $at[ $id - 1 ]->{channel}) ? 1 : 0; + } + push(@chans, $chan); + } + + my $pattern = $at[ $id - 1 ]->{pattern}; + $pattern =~ s/"/\"/g, my $template = TemplateNew("at_timer_new.html"); + my $vars = { usercss => $UserCSS, + channels => \@chans, + id => $id, + url => $MyURL, + prio => $at[ $id - 1 ]->{prio} ? $at[ $id - 1 ]->{prio} : $CONFIG{AT_PRIORITY}, + lft => $at[ $id - 1 ]->{lft} ? $at[ $id - 1 ]->{lft} : $CONFIG{AT_LIFETIME}, + active => $at[ $id - 1 ]->{active}, + done => $at[ $id - 1 ]->{done}, + episode => $at[ $id - 1 ]->{episode}, + pattern => $pattern, + starth => (length($at[ $id - 1 ]->{start}) >= 4) ? substr($at[ $id - 1 ]->{start}, 0, 2) : undef, + startm => (length($at[ $id - 1 ]->{start}) >= 4) ? substr($at[ $id - 1 ]->{start}, 2, 5) : undef, + stoph => (length($at[ $id - 1 ]->{stop}) >= 4) ? substr($at[ $id - 1 ]->{stop}, 0, 2) : undef, + stopm => (length($at[ $id - 1 ]->{stop}) >= 4) ? substr($at[ $id - 1 ]->{stop}, 2, 5) : undef, + title => ($at[ $id - 1 ]->{section} & 1) ? 1 : 0, + subtitle => ($at[ $id - 1 ]->{section} & 2) ? 1 : 0, + description => ($at[ $id - 1 ]->{section} & 4) ? 1 : 0, + directory => $at[ $id - 1 ]->{directory}, + newtimer => 0, + (map { $_ => $at[ $id - 1 ]->{weekdays}->{$_} } qw (wday_mon wday_tue wday_wed wday_thu wday_fri wday_sat wday_sun)), + help_url => HelpURL("at_timer_new") + }; + + $template->param($vars); + my $output; + my $out = $template->output; + $Xtemplate->process(\$out, $vars, \$output) || return (header("500", "text/html", $Xtemplate->error())); + return (header("200", "text/html", $output)); } sub at_timer_new { - my @chans; - for my $chan (@CHAN) { - if($CONFIG{CHANNELS_WANTED_AUTOTIMER}) { - my $found = 0; - for my $n (split(",", $CONFIG{CHANNELS_WANTED})) { - ($found = 1) if($n eq $chan->{vdr_id}); - } - next if(!$found); - push(@chans, $chan); - } - } - my $template = TemplateNew("at_timer_new.html"); - my $vars = { - usercss => $UserCSS, - url => $MyURL, - active => $q->param("active"), - done => $q->param("done"), - title => 1, - wday_mon => 1, wday_tue=>1, wday_wed=>1, wday_thu=>1, wday_fri=>1, wday_sat=>1, wday_sun=>1, - channels => ($CONFIG{CHANNELS_WANTED_AUTOTIMER} ? \@chans : \@CHAN), - prio => $CONFIG{AT_PRIORITY}, - lft => $CONFIG{AT_LIFETIME}, - newtimer => 1, - help_url => HelpURL("at_timer_new") - }; - $template->param($vars); - my $output; - my $out = $template->output; - $Xtemplate->process(\$out, $vars, \$output) || return(header("500", "text/html", $Xtemplate->error())); - return(header("200", "text/html", $output)); + my @chans; + for my $chan (@CHAN) { + if ($CONFIG{CHANNELS_WANTED_AUTOTIMER}) { + my $found = 0; + for my $n (split(",", $CONFIG{CHANNELS_WANTED})) { + ($found = 1) if ($n eq $chan->{vdr_id}); + } + next if (!$found); + push(@chans, $chan); + } + } + my $template = TemplateNew("at_timer_new.html"); + my $vars = { usercss => $UserCSS, + url => $MyURL, + active => $q->param("active"), + done => $q->param("done"), + title => 1, + wday_mon => 1, + wday_tue => 1, + wday_wed => 1, + wday_thu => 1, + wday_fri => 1, + wday_sat => 1, + wday_sun => 1, + channels => ($CONFIG{CHANNELS_WANTED_AUTOTIMER} ? \@chans : \@CHAN), + prio => $CONFIG{AT_PRIORITY}, + lft => $CONFIG{AT_LIFETIME}, + newtimer => 1, + help_url => HelpURL("at_timer_new") + }; + $template->param($vars); + my $output; + my $out = $template->output; + $Xtemplate->process(\$out, $vars, \$output) || return (header("500", "text/html", $Xtemplate->error())); + return (header("200", "text/html", $output)); } sub at_timer_save { - my $id = $q->param("id"); - - my $start; - my $stop; - if (length($q->param("starth")) > 0 || length($q->param("startm")) > 0) { - $start = sprintf("%02s%02s", $q->param("starth"), $q->param("startm")); - } - if (length($q->param("stoph")) > 0 || length($q->param("stopm")) > 0) { - $stop = sprintf("%02s%02s", $q->param("stoph"), $q->param("stopm")); - } - - if($q->param("save")) { - if(!$id) { - my @at = AT_Read(); - my $section = 0; - ($section += 1) if($q->param("title")); - ($section += 2) if($q->param("subtitle")); - ($section += 4) if($q->param("description")); - push(@at, { - episode => $q->param("episode") ? $q->param("episode") : 0, - active => $q->param("active"), - done => $q->param("done"), - pattern => $q->param("pattern"), - section => $section, - start => $start, - stop => $stop, - prio => $q->param("prio"), - lft => $q->param("lft"), - channel => $q->param("channel"), - directory => $q->param("directory"), - weekdays => {map {$_=>$q->param($_)?$q->param($_):0} (qw (wday_mon wday_tue wday_wed wday_thu wday_fri wday_sat wday_sun))} - }); - AT_Write(@at); - } else { - my $z = 0; - my @at; - for(AT_Read()) { - $z++; - if($z != $id) { - push(@at, $_); - } else { - my $section = 0; - ($section += 1) if($q->param("title")); - ($section += 2) if($q->param("subtitle")); - ($section += 4) if($q->param("description")); - push(@at, { - episode => $q->param("episode") ? $q->param("episode") : 0, - active => $q->param("active"), - done => $q->param("done"), - pattern => $q->param("pattern"), - section => $section, - start => $start, - stop => $stop, - prio => $q->param("prio"), - lft => $q->param("lft"), - channel => $q->param("channel"), - directory => $q->param("directory"), - weekdays => {map {$_=>$q->param($_)?$q->param($_):0} (qw (wday_mon wday_tue wday_wed wday_thu wday_fri wday_sat wday_sun))} - }); - } - } - AT_Write(@at); - } - - $CONFIG{CACHE_LASTUPDATE} = 0; - UptoDate(); - } - headerForward("$MyURL?aktion=at_timer_list"); + my $id = $q->param("id"); + + my $start; + my $stop; + if (length($q->param("starth")) > 0 || length($q->param("startm")) > 0) { + $start = sprintf("%02s%02s", $q->param("starth"), $q->param("startm")); + } + if (length($q->param("stoph")) > 0 || length($q->param("stopm")) > 0) { + $stop = sprintf("%02s%02s", $q->param("stoph"), $q->param("stopm")); + } + + if ($q->param("save")) { + if (!$id) { + my @at = AT_Read(); + my $section = 0; + ($section += 1) if ($q->param("title")); + ($section += 2) if ($q->param("subtitle")); + ($section += 4) if ($q->param("description")); + push(@at, + { episode => $q->param("episode") ? $q->param("episode") : 0, + active => $q->param("active"), + done => $q->param("done"), + pattern => $q->param("pattern"), + section => $section, + start => $start, + stop => $stop, + prio => $q->param("prio"), + lft => $q->param("lft"), + channel => $q->param("channel"), + directory => $q->param("directory"), + weekdays => { map { $_ => $q->param($_) ? $q->param($_) : 0 } (qw (wday_mon wday_tue wday_wed wday_thu wday_fri wday_sat wday_sun)) } + } + ); + AT_Write(@at); + } else { + my $z = 0; + my @at; + for (AT_Read()) { + $z++; + if ($z != $id) { + push(@at, $_); + } else { + my $section = 0; + ($section += 1) if ($q->param("title")); + ($section += 2) if ($q->param("subtitle")); + ($section += 4) if ($q->param("description")); + push(@at, + { episode => $q->param("episode") ? $q->param("episode") : 0, + active => $q->param("active"), + done => $q->param("done"), + pattern => $q->param("pattern"), + section => $section, + start => $start, + stop => $stop, + prio => $q->param("prio"), + lft => $q->param("lft"), + channel => $q->param("channel"), + directory => $q->param("directory"), + weekdays => { map { $_ => $q->param($_) ? $q->param($_) : 0 } (qw (wday_mon wday_tue wday_wed wday_thu wday_fri wday_sat wday_sun)) } + } + ); + } + } + AT_Write(@at); + } + + $CONFIG{CACHE_LASTUPDATE} = 0; + UptoDate(); + } + headerForward("$MyURL?aktion=at_timer_list"); } sub at_timer_delete { - my $id = $q->param("id"); - my $z = 0; - - my @at = AT_Read(); - my @new; - if($id) { - for(@at) { - $z++; - push(@new, $_) if($id != $z); - } - AT_Write(@new); - } else { - my @sorted; - for($q->param) { - if(/xxxx_(.*)/) { - push(@sorted, $1); - } - } - @sorted = sort({ $b <=> $a } @sorted); - my $z = 0; - for my $at (@at) { - $z++; - my $push = 1; - for my $sorted (@sorted) { - ($push = 0) if($z == $sorted); - } - push(@new, $at) if($push); - } - AT_Write(@new); - } - headerForward("$MyURL?aktion=at_timer_list"); + my $id = $q->param("id"); + my $z = 0; + + my @at = AT_Read(); + my @new; + if ($id) { + for (@at) { + $z++; + push(@new, $_) if ($id != $z); + } + AT_Write(@new); + } else { + my @sorted; + for ($q->param) { + if (/xxxx_(.*)/) { + push(@sorted, $1); + } + } + @sorted = sort({ $b <=> $a } @sorted); + my $z = 0; + for my $at (@at) { + $z++; + my $push = 1; + for my $sorted (@sorted) { + ($push = 0) if ($z == $sorted); + } + push(@new, $at) if ($push); + } + AT_Write(@new); + } + headerForward("$MyURL?aktion=at_timer_list"); } sub at_timer_test { - my $id = $q->param("id"); - my @chans; - for my $chan (@CHAN) { - if($CONFIG{CHANNELS_WANTED_AUTOTIMER}) { - my $found = 0; - for my $n (split(",", $CONFIG{CHANNELS_WANTED})) { - ($found = 1) if($n eq $chan->{vdr_id}); - } - next if(!$found); - } - if($chan->{vdr_id}) { - $chan->{cur} = ($chan->{vdr_id} == $q->param("channel")) ? 1 : 0; - } - push(@chans, $chan); - } - - my $section = 0; - ($section += 1) if($q->param("title")); - ($section += 2) if($q->param("subtitle")); - ($section += 4) if($q->param("description")); - - my @at = { - episode => $q->param("episode") ? $q->param("episode") : 0, - active => $q->param("active"), - pattern => $q->param("pattern"), - channel => $q->param("channel"), - section => $section, - start => length($q->param("starth")) > 0 || length($q->param("startm")) > 0 ? sprintf("%02s%02s", $q->param("starth"), $q->param("startm")) : undef, - stop => length($q->param("stoph")) > 0 || length($q->param("stopm")) > 0 ? sprintf("%02s%02s", $q->param("stoph"), $q->param("stopm")) : undef, - directory => $q->param("directory"), - weekdays => {map {$_=>$q->param($_)?$q->param($_):0} (qw (wday_mon wday_tue wday_wed wday_thu wday_fri wday_sat wday_sun))} - }; - - my @at_matches = AutoTimer(1, @at); - my $template = TemplateNew("at_timer_new.html"); - my $pattern = $q->param("pattern"); - $pattern =~ s/"/\"/g; - my $vars = { - id => $id, - usercss => $UserCSS, - url => $MyURL, - channels => \@chans, -#TODO $q->Vars, - active => $q->param("active"), - pattern => $pattern, - title => $q->param("title") ? $q->param("title") : 0, - subtitle => $q->param("subtitle") ? $q->param("subtitle") : 0, - description => $q->param("description") ? $q->param("description") :0 , - wday_mon => $q->param("wday_mon") ? $q->param("wday_mon") : 0, - wday_tue => $q->param("wday_tue") ? $q->param("wday_tue") : 0, - wday_wed => $q->param("wday_wed") ? $q->param("wday_wed") : 0, - wday_thu => $q->param("wday_thu") ? $q->param("wday_thu") : 0, - wday_fri => $q->param("wday_fri") ? $q->param("wday_fri") : 0, - wday_sat => $q->param("wday_sat") ? $q->param("wday_sat") : 0, - wday_sun => $q->param("wday_sun") ? $q->param("wday_sun") : 0, - channel => $q->param("channel"), - starth => $q->param("starth"), - startm => $q->param("startm"), - stoph => $q->param("stoph"), - stopm => $q->param("stopm"), - prio => $q->param("prio"), - lft => $q->param("lft"), - episode => $q->param("episode") ? $q->param("episode") : 0, - done => $q->param("done"), - directory => $q->param("directory"), - at_test => 1, - matches => \@at_matches - }; - $template->param($vars); - my $output; - my $out = $template->output; - $Xtemplate->process(\$out, $vars, \$output) || return(header("500", "text/html", $Xtemplate->error())); - return(header("200", "text/html", $output)); + my $id = $q->param("id"); + my @chans; + for my $chan (@CHAN) { + if ($CONFIG{CHANNELS_WANTED_AUTOTIMER}) { + my $found = 0; + for my $n (split(",", $CONFIG{CHANNELS_WANTED})) { + ($found = 1) if ($n eq $chan->{vdr_id}); + } + next if (!$found); + } + if ($chan->{vdr_id}) { + $chan->{cur} = ($chan->{vdr_id} == $q->param("channel")) ? 1 : 0; + } + push(@chans, $chan); + } + + my $section = 0; + ($section += 1) if ($q->param("title")); + ($section += 2) if ($q->param("subtitle")); + ($section += 4) if ($q->param("description")); + + my @at = { episode => $q->param("episode") ? $q->param("episode") : 0, + active => $q->param("active"), + pattern => $q->param("pattern"), + channel => $q->param("channel"), + section => $section, + start => length($q->param("starth")) > 0 || length($q->param("startm")) > 0 ? sprintf("%02s%02s", $q->param("starth"), $q->param("startm")) : undef, + stop => length($q->param("stoph")) > 0 || length($q->param("stopm")) > 0 ? sprintf("%02s%02s", $q->param("stoph"), $q->param("stopm")) : undef, + directory => $q->param("directory"), + weekdays => { map { $_ => $q->param($_) ? $q->param($_) : 0 } (qw (wday_mon wday_tue wday_wed wday_thu wday_fri wday_sat wday_sun)) } + }; + + my @at_matches = AutoTimer(1, @at); + my $template = TemplateNew("at_timer_new.html"); + my $pattern = $q->param("pattern"); + $pattern =~ s/"/\"/g; + my $vars = { + id => $id, + usercss => $UserCSS, + url => $MyURL, + channels => \@chans, + + #TODO $q->Vars, + active => $q->param("active"), + pattern => $pattern, + title => $q->param("title") ? $q->param("title") : 0, + subtitle => $q->param("subtitle") ? $q->param("subtitle") : 0, + description => $q->param("description") ? $q->param("description") : 0, + wday_mon => $q->param("wday_mon") ? $q->param("wday_mon") : 0, + wday_tue => $q->param("wday_tue") ? $q->param("wday_tue") : 0, + wday_wed => $q->param("wday_wed") ? $q->param("wday_wed") : 0, + wday_thu => $q->param("wday_thu") ? $q->param("wday_thu") : 0, + wday_fri => $q->param("wday_fri") ? $q->param("wday_fri") : 0, + wday_sat => $q->param("wday_sat") ? $q->param("wday_sat") : 0, + wday_sun => $q->param("wday_sun") ? $q->param("wday_sun") : 0, + channel => $q->param("channel"), + starth => $q->param("starth"), + startm => $q->param("startm"), + stoph => $q->param("stoph"), + stopm => $q->param("stopm"), + prio => $q->param("prio"), + lft => $q->param("lft"), + episode => $q->param("episode") ? $q->param("episode") : 0, + done => $q->param("done"), + directory => $q->param("directory"), + at_test => 1, + matches => \@at_matches + }; + $template->param($vars); + my $output; + my $out = $template->output; + $Xtemplate->process(\$out, $vars, \$output) || return (header("500", "text/html", $Xtemplate->error())); + return (header("200", "text/html", $output)); } ############################################################################# # timeline ############################################################################# sub prog_timeline { - return if(UptoDate()); - my $time = $q->param("time"); - - my $myself = Encode_Referer($MyURL . "?" . $Query); - - # zeitpunkt bestimmen - my $event_time; - my $event_time_to; - - if($time) { - my ($hour, $minute); - if($time =~ /(\d{1,2})(\D?)(\d{1,2})/) { - if(length($1) == 1 && length($3) == 1 && !$2) { - $hour = $1 . $3; - } else { - ($hour, $minute) = ($1, $3); - } - } elsif($time =~ /\d/) { - $hour = $time; - } - - if($hour <= my_strftime("%H") && $minute < my_strftime("%M")) { - $event_time = timelocal( - 0, - $minute, - $hour, - my_strftime("%d", time + 86400), - (my_strftime("%m", time + 86400) - 1), - my_strftime("%Y") - ) + 1; + return if (UptoDate()); + my $time = $q->param("time"); + + my $myself = Encode_Referer($MyURL . "?" . $Query); + + # zeitpunkt bestimmen + my $event_time; + my $event_time_to; + + if ($time) { + my ($hour, $minute); + if ($time =~ /(\d{1,2})(\D?)(\d{1,2})/) { + if (length($1) == 1 && length($3) == 1 && !$2) { + $hour = $1 . $3; + } else { + ($hour, $minute) = ($1, $3); + } + } elsif ($time =~ /\d/) { + $hour = $time; + } + + if ($hour <= my_strftime("%H") && $minute < my_strftime("%M")) { + $event_time = timelocal(0, $minute, $hour, my_strftime("%d", time + 86400), (my_strftime("%m", time + 86400) - 1), my_strftime("%Y")) + 1; + } else { + $event_time = timelocal(0, $minute, $hour, my_strftime("%d"), (my_strftime("%m") - 1), my_strftime("%Y")) + 1; + } } else { - $event_time = timelocal( - 0, - $minute, - $hour, - my_strftime("%d"), - (my_strftime("%m") - 1), - my_strftime("%Y") - ) + 1; - } - } else { - $event_time = time(); - } - - $event_time_to = $event_time + ($CONFIG{ZEITRAHMEN} * 3600); - - # Timer parsen, und erstmal alle rausschmeissen die nicht in der Zeitzone liegen - my $TIM; - for my $timer (ParseTimer(0)) { - next if($timer->{stopsse} < $event_time or $timer->{startsse} > $event_time_to); - my $title = (split(/\~/, $timer->{title}))[-1]; - $TIM->{$title} = $timer; - } - - my(@show, @shows, @temp); - my $shows; - - my @epgChannels; - for my $channel (@CHAN) { - # if its wished, display only wanted channels - if($CONFIG{CHANNELS_WANTED_TIMELINE}) { - my $found = 0; - for my $n (split(",", $CONFIG{CHANNELS_WANTED})) { - ($found = 1) if($n eq $channel->{vdr_id}); - } - next if(!$found); - } - - # skip channels without EPG data - if(ChannelHasEPG($channel->{vdr_id})) { - push(@epgChannels, $channel->{vdr_id}); - } - } - - @epgChannels = keys(%EPG) - unless scalar @epgChannels; - - foreach(@epgChannels) { # Sender durchgehen - foreach my $event (sort {$a->{start} <=> $b->{start} } @{$EPG{$_}}) { # Events durchgehen - next if($event->{stop} < $event_time or $event->{start} > $event_time_to ); - - my $title = $event->{title}; - $title =~ s/"/\"/g; - push(@show, { - start => $event->{start}, - stop => $event->{stop}, - title => $title, - subtitle => (($event->{subtitle} && length($event->{subtitle}) > 30) ? substr($event->{subtitle}, 0, 30) . "..." : $event->{subtitle}), - progname => $event->{channel_name}, - summary => $event->{summary}, - vdr_id => $event->{vdr_id}, - proglink => sprintf("%s?aktion=prog_list&vdr_id=%s", $MyURL, $event->{vdr_id}), - switchurl=> sprintf("%s?aktion=prog_switch&channel=%s", $MyURL, $event->{vdr_id}), - infurl => ($event->{summary} ? sprintf("%s?aktion=prog_detail&epg_id=%s&vdr_id=%s&referer=%s", $MyURL, $event->{event_id}, $event->{vdr_id}, $myself) : undef), - recurl => sprintf("%s?aktion=timer_new_form&epg_id=%s&vdr_id=%s&referer=%s", $MyURL, $event->{event_id}, $event->{vdr_id}, $myself), - anchor => $event->{event_id}, - timer => ( defined $TIM->{ $event->{title} } && $TIM->{ $event->{title} }->{vdr_id} == $event->{vdr_id} && $TIM->{ $event->{title} }->{active} ? 1 : 0 ), - }); - } - # needed for vdr 1.0.x, dunno why - @show = sort({ $a->{vdr_id} <=> $b->{vdr_id} } @show); - push(@{ $shows->{ $EPG{$_}->[0]->{vdr_id} } }, @show) - if @show; - undef @show; - } - - my $vars = { - usercss => $UserCSS, - shows => $shows, - shows2 => $shows, - now_sec => $event_time, - now => strftime("%H:%M", localtime($event_time)), - datum => my_strftime("%A, %x", time), - nowurl => $MyURL . "?aktion=prog_timeline", - url => $MyURL, - config => \%CONFIG - }; - - my $template = TemplateNew("prog_timeline.html"); - $template->param($vars); - my $output; - my $out = $template->output; - $Xtemplate->process(\$out, $vars, \$output) || return(header("500", "text/html", $Xtemplate->error())); - return(header("200", "text/html", $output)); -} + $event_time = time(); + } + + $event_time_to = $event_time + ($CONFIG{ZEITRAHMEN} * 3600); + + # Timer parsen, und erstmal alle rausschmeissen die nicht in der Zeitzone liegen + my $TIM; + for my $timer (ParseTimer(0)) { + next if ($timer->{stopsse} < $event_time or $timer->{startsse} > $event_time_to); + my $title = (split(/\~/, $timer->{title}))[-1]; + $TIM->{$title} = $timer; + } + my (@show, @shows, @temp); + my $shows; + + my @epgChannels; + for my $channel (@CHAN) { + + # if its wished, display only wanted channels + if ($CONFIG{CHANNELS_WANTED_TIMELINE}) { + my $found = 0; + for my $n (split(",", $CONFIG{CHANNELS_WANTED})) { + ($found = 1) if ($n eq $channel->{vdr_id}); + } + next if (!$found); + } + + # skip channels without EPG data + if (ChannelHasEPG($channel->{vdr_id})) { + push(@epgChannels, $channel->{vdr_id}); + } + } + + @epgChannels = keys(%EPG) + unless scalar @epgChannels; + + foreach (@epgChannels) { # Sender durchgehen + foreach my $event (sort { $a->{start} <=> $b->{start} } @{ $EPG{$_} }) { # Events durchgehen + next if ($event->{stop} < $event_time or $event->{start} > $event_time_to); + + my $title = $event->{title}; + $title =~ s/"/\"/g; + push(@show, + { start => $event->{start}, + stop => $event->{stop}, + title => $title, + subtitle => (($event->{subtitle} && length($event->{subtitle}) > 30) ? substr($event->{subtitle}, 0, 30) . "..." : $event->{subtitle}), + progname => $event->{channel_name}, + summary => $event->{summary}, + vdr_id => $event->{vdr_id}, + proglink => sprintf("%s?aktion=prog_list&vdr_id=%s", $MyURL, $event->{vdr_id}), + switchurl => sprintf("%s?aktion=prog_switch&channel=%s", $MyURL, $event->{vdr_id}), + infurl => ($event->{summary} ? sprintf("%s?aktion=prog_detail&epg_id=%s&vdr_id=%s&referer=%s", $MyURL, $event->{event_id}, $event->{vdr_id}, $myself) : undef), + recurl => sprintf("%s?aktion=timer_new_form&epg_id=%s&vdr_id=%s&referer=%s", $MyURL, $event->{event_id}, $event->{vdr_id}, $myself), + anchor => $event->{event_id}, + timer => (defined $TIM->{ $event->{title} } && $TIM->{ $event->{title} }->{vdr_id} == $event->{vdr_id} && $TIM->{ $event->{title} }->{active} ? 1 : 0), + } + ); + } + + # needed for vdr 1.0.x, dunno why + @show = sort({ $a->{vdr_id} <=> $b->{vdr_id} } @show); + push(@{ $shows->{ $EPG{$_}->[0]->{vdr_id} } }, @show) + if @show; + undef @show; + } + + my $vars = { usercss => $UserCSS, + shows => $shows, + shows2 => $shows, + now_sec => $event_time, + now => strftime("%H:%M", localtime($event_time)), + datum => my_strftime("%A, %x", time), + nowurl => $MyURL . "?aktion=prog_timeline", + url => $MyURL, + config => \%CONFIG + }; + + my $template = TemplateNew("prog_timeline.html"); + $template->param($vars); + my $output; + my $out = $template->output; + $Xtemplate->process(\$out, $vars, \$output) || return (header("500", "text/html", $Xtemplate->error())); + return (header("200", "text/html", $output)); +} ############################################################################# # summary ############################################################################# sub prog_summary { - return if(UptoDate()); - my $time = $q->param("time"); - my $search = $q->param("search"); - - # zeitpunkt bestimmen - my $event_time; - if($time) { - my ($hour, $minute); - if($time =~ /(\d{1,2})(\D?)(\d{1,2})/) { - if(length($1) == 1 && length($3) == 1 && !$2) { - $hour = $1 . $3; - } else { - ($hour, $minute) = ($1, $3); - } - } elsif($time =~ /\d/) { - $hour = $time; - } - - if($hour <= my_strftime("%H") && $minute < my_strftime("%M")) { - $event_time = timelocal( - 0, - $minute, - $hour, - my_strftime("%d", time + 86400), - (my_strftime("%m", time + 86400) - 1), - my_strftime("%Y") - ) + 1; + return if (UptoDate()); + my $time = $q->param("time"); + my $search = $q->param("search"); + + # zeitpunkt bestimmen + my $event_time; + if ($time) { + my ($hour, $minute); + if ($time =~ /(\d{1,2})(\D?)(\d{1,2})/) { + if (length($1) == 1 && length($3) == 1 && !$2) { + $hour = $1 . $3; + } else { + ($hour, $minute) = ($1, $3); + } + } elsif ($time =~ /\d/) { + $hour = $time; + } + + if ($hour <= my_strftime("%H") && $minute < my_strftime("%M")) { + $event_time = timelocal(0, $minute, $hour, my_strftime("%d", time + 86400), (my_strftime("%m", time + 86400) - 1), my_strftime("%Y")) + 1; + } else { + $event_time = timelocal(0, $minute, $hour, my_strftime("%d"), (my_strftime("%m") - 1), my_strftime("%Y")) + 1; + } } else { - $event_time = timelocal( - 0, - $minute, - $hour, - my_strftime("%d"), - (my_strftime("%m") - 1), - my_strftime("%Y") - ) + 1; - } - } else { - $event_time = time(); - } - - my $pattern; - my $mode; - if($search) { - if($search =~ /^\/(.*)\/(i?)$/) { - $pattern=$1; - $mode=$2 - } else { - $search =~ s/([\+\?\.\*\^\$\(\)\[\]\{\}\|\\])/\\$1/g; - } - } - - my $now = time(); - my(@show, @shows, @temp); - for(keys(%EPG)) { - for my $event (@{$EPG{$_}}) { - if(!$search) { - if($CONFIG{CHANNELS_WANTED_SUMMARY}) { - my $f = 0; - for my $n (split(/\,/, $CONFIG{CHANNELS_WANTED})) { - ($f = 1) if($n eq $event->{vdr_id}); - } - next if(!$f); - } - next if($event_time > $event->{stop}); - } else { - my($found); - if($pattern) { - # We have a RegExp - next if(!length($pattern)); - next if(!defined($pattern)); - my $SearchStr = $event->{title} . "~" . $event->{subtitle} . "~" . $event->{summary}; - # Shall we search case insensitive? - if(($mode eq "i") && ($SearchStr !~ /$pattern/i)) { - next; - } elsif(($mode ne "i") && ($SearchStr !~ /$pattern/)) { - next; - } else { - $found = 1; - } - } else { - next if(! length($search)); - for my $word (split(/ +/, $search)) { - $found = 0; - for my $section (qw(title subtitle summary)) { - next unless($event->{$section}); - if($event->{$section} =~ /$word/i) { - $found = 1; - last; - } - } - last unless($found); - } - } - next unless($found); - } - - my $displaytext = CGI::escapeHTML($event->{summary}); - my $displaytitle = CGI::escapeHTML($event->{title}); - my $displaysubtitle = CGI::escapeHTML($event->{subtitle}); - - $displaytext =~ s/\n/<br \/>\n/g; - $displaytext =~ s/\|/<br \/>\n/g; - $displaytitle =~ s/\n/<br \/>\n/g; - $displaytitle =~ s/\|/<br \/>\n/g; - if ($displaysubtitle) { - $displaysubtitle =~ s/\n/<br \/>\n/g; - $displaysubtitle =~ s/\|/<br \/>\n/g; - } - my $myself = Encode_Referer($MyURL . "?" . $Query); - push(@show, { - date => my_strftime("%x", $event->{start}), - longdate => my_strftime("%A, %x", $event->{start}), - start => my_strftime("%H:%M", $event->{start}), - stop => my_strftime("%H:%M", $event->{stop}), - event_start => $event->{start}, - title => $displaytitle, - subtitle => $displaysubtitle, - progname => CGI::escapeHTML($event->{channel_name}), - summary => $displaytext, - vdr_id => $event->{vdr_id}, - proglink => sprintf("%s?aktion=prog_list&vdr_id=%s", $MyURL, $event->{vdr_id}), - switchurl => sprintf("%s?aktion=prog_switch&channel=%s", $MyURL, $event->{vdr_id}), - streamurl => sprintf("%s%s?aktion=live_stream&channel=%s", $MyStreamBase, $CONFIG{TV_EXT}, $event->{vdr_id}), - stream_live_on => $event->{start} <= $now && $now <= $event->{stop} ? $CONFIG{ST_FUNC} && $CONFIG{ST_LIVE_ON} : undef, - infurl => $event->{summary} ? sprintf("%s?aktion=prog_detail&epg_id=%s&vdr_id=%s&referer=%s", $MyURL, $event->{event_id}, $event->{vdr_id}, $myself) : undef, - recurl => sprintf("%s?aktion=timer_new_form&epg_id=%s&vdr_id=%s&referer=%s", $MyURL, $event->{event_id}, $event->{vdr_id}, $myself), - find_title => uri_escape($event->{title}), - anchor => "id" . $event->{event_id} - }); - last if(!$search); - } - } - - # sort by event's start time and with equal start time sort by channel id - @show = sort({ $a->{event_start} <=> $b->{event_start} || $a->{vdr_id} <=> $b->{vdr_id} } @show); - - # - my @status; - for(my $i = 0; $i <= $#show; $i++) { - undef(@temp); - undef(@status); - for(my $z = 0; $z < $CONFIG{PROG_SUMMARY_COLS}; $i++, $z++) { - push(@temp, $show[$i]); - push(@status, $show[$i]); - } - $i--; - push(@shows, { day => [ @temp ], status => [ @status ] }); - } - - # - my $template = TemplateNew("prog_summary.html"); - my $vars = { - usercss => $UserCSS, - rows => \@shows, - now => strftime("%H:%M", localtime($event_time)), - title => $search ? gettext("Suitable matches for:") . " " . $search : strftime("%H:%M", localtime($event_time)) . " " . gettext("o'clock"), - nowurl => $MyURL . "?aktion=prog_summary", - url => $MyURL - }; - $template->param($vars); - my $output; - my $out = $template->output; - $Xtemplate->process(\$out, $vars, \$output) || return(header("500", "text/html", $Xtemplate->error())); - return(header("200", "text/html", $output)); -} + $event_time = time(); + } + + my $pattern; + my $mode; + if ($search) { + if ($search =~ /^\/(.*)\/(i?)$/) { + $pattern = $1; + $mode = $2; + } else { + $search =~ s/([\+\?\.\*\^\$\(\)\[\]\{\}\|\\])/\\$1/g; + } + } + my $now = time(); + my (@show, @shows, @temp); + for (keys(%EPG)) { + for my $event (@{ $EPG{$_} }) { + if (!$search) { + if ($CONFIG{CHANNELS_WANTED_SUMMARY}) { + my $f = 0; + for my $n (split(/\,/, $CONFIG{CHANNELS_WANTED})) { + ($f = 1) if ($n eq $event->{vdr_id}); + } + next if (!$f); + } + next if ($event_time > $event->{stop}); + } else { + my ($found); + if ($pattern) { + + # We have a RegExp + next if (!length($pattern)); + next if (!defined($pattern)); + my $SearchStr = $event->{title} . "~" . $event->{subtitle} . "~" . $event->{summary}; + + # Shall we search case insensitive? + if (($mode eq "i") && ($SearchStr !~ /$pattern/i)) { + next; + } elsif (($mode ne "i") && ($SearchStr !~ /$pattern/)) { + next; + } else { + $found = 1; + } + } else { + next if (!length($search)); + for my $word (split(/ +/, $search)) { + $found = 0; + for my $section (qw(title subtitle summary)) { + next unless ($event->{$section}); + if ($event->{$section} =~ /$word/i) { + $found = 1; + last; + } + } + last unless ($found); + } + } + next unless ($found); + } + + my $displaytext = CGI::escapeHTML($event->{summary}); + my $displaytitle = CGI::escapeHTML($event->{title}); + my $displaysubtitle = CGI::escapeHTML($event->{subtitle}); + + $displaytext =~ s/\n/<br \/>\n/g; + $displaytext =~ s/\|/<br \/>\n/g; + $displaytitle =~ s/\n/<br \/>\n/g; + $displaytitle =~ s/\|/<br \/>\n/g; + if ($displaysubtitle) { + $displaysubtitle =~ s/\n/<br \/>\n/g; + $displaysubtitle =~ s/\|/<br \/>\n/g; + } + my $myself = Encode_Referer($MyURL . "?" . $Query); + push(@show, + { date => my_strftime("%x", $event->{start}), + longdate => my_strftime("%A, %x", $event->{start}), + start => my_strftime("%H:%M", $event->{start}), + stop => my_strftime("%H:%M", $event->{stop}), + event_start => $event->{start}, + title => $displaytitle, + subtitle => $displaysubtitle, + progname => CGI::escapeHTML($event->{channel_name}), + summary => $displaytext, + vdr_id => $event->{vdr_id}, + proglink => sprintf("%s?aktion=prog_list&vdr_id=%s", $MyURL, $event->{vdr_id}), + switchurl => sprintf("%s?aktion=prog_switch&channel=%s", $MyURL, $event->{vdr_id}), + streamurl => sprintf("%s%s?aktion=live_stream&channel=%s", $MyStreamBase, $CONFIG{TV_EXT}, $event->{vdr_id}), + stream_live_on => $event->{start} <= $now && $now <= $event->{stop} ? $CONFIG{ST_FUNC} && $CONFIG{ST_LIVE_ON} : undef, + infurl => $event->{summary} ? sprintf("%s?aktion=prog_detail&epg_id=%s&vdr_id=%s&referer=%s", $MyURL, $event->{event_id}, $event->{vdr_id}, $myself) : undef, + recurl => sprintf("%s?aktion=timer_new_form&epg_id=%s&vdr_id=%s&referer=%s", $MyURL, $event->{event_id}, $event->{vdr_id}, $myself), + find_title => uri_escape($event->{title}), + anchor => "id" . $event->{event_id} + } + ); + last if (!$search); + } + } + + if ($search) { + # sort by event's start time and with equal start time sort by channel id + @show = sort({ $a->{event_start} <=> $b->{event_start} || $a->{vdr_id} <=> $b->{vdr_id} } @show); + } else { + # sort by channel id + @show = sort({ $a->{vdr_id} <=> $b->{vdr_id} } @show); + } + + # + my @status; + for (my $i = 0 ; $i <= $#show ; $i++) { + undef(@temp); + undef(@status); + for (my $z = 0 ; $z < $CONFIG{PROG_SUMMARY_COLS} ; $i++, $z++) { + push(@temp, $show[$i]); + push(@status, $show[$i]); + } + $i--; + push(@shows, { day => [@temp], status => [@status] }); + } + + # + my $template = TemplateNew("prog_summary.html"); + my $vars = { usercss => $UserCSS, + rows => \@shows, + now => strftime("%H:%M", localtime($event_time)), + title => $search ? gettext("Suitable matches for:") . " " . $search : strftime("%H:%M", localtime($event_time)) . " " . gettext("o'clock"), + nowurl => $MyURL . "?aktion=prog_summary", + url => $MyURL + }; + $template->param($vars); + my $output; + my $out = $template->output; + $Xtemplate->process(\$out, $vars, \$output) || return (header("500", "text/html", $Xtemplate->error())); + return (header("200", "text/html", $output)); +} ############################################################################# # recordings ############################################################################# sub rec_list { - my @recordings; - - my $desc; - if(!defined($q->param("desc"))) { - $desc = 1; - } else { - $q->param("desc") ? ($desc = 1) : ($desc = 0); - } - my $sortby = $q->param("sortby"); - ($sortby = "name") if(!$sortby); - my $parent = $q->param("parent"); - my $parent2; - if(!$parent) { - $parent = 0; - } else { - $parent = uri_escape($parent); - } - - ParseRecordings($parent, $sortby, $desc); - - # create path array - my @path; my $fuse = 0; - my $rparent = $parent; -# printf("PATH: (%s)\n", $parent); - while($rparent) { - for my $recording (@RECORDINGS) { - if($recording->{recording_id} eq $rparent) { - push(@path, { - name => $recording->{name}, - url => ($recording->{recording_id} ne $parent) ? sprintf("%s?aktion=rec_list&parent=%s", $MyURL, $recording->{recording_id}) : "" - }); - $rparent = $recording->{parent}; - last; - } - } - $fuse++; - last if($fuse > 100); - } - push(@path, { - name => gettext("Schedule"), - url => ($parent ne 0) ? sprintf("%s?aktion=rec_list&parent=%s", $MyURL, 0) : "" - }); - @path = reverse(@path); - - # filter - if(defined($parent)) { - for my $recording (@RECORDINGS) { - if($recording->{parent} eq $parent) { - push(@recordings, $recording); - } - } - } else { - @recordings = @RECORDINGS; - } - - # - if($sortby eq "time") { - if(!$desc) { - @recordings = sort({ $b->{time} <=> $a->{time} } @recordings); - } else { - @recordings = sort({ $a->{time} <=> $b->{time} } @recordings); - } - } elsif($sortby eq "name") { - if(!$desc) { - @recordings = sort({ lc($b->{name}) cmp lc($a->{name}) } @recordings); - } else { - @recordings = sort({ lc($a->{name}) cmp lc($b->{name}) } @recordings); - } - } elsif($sortby eq "date") { - if(!$desc) { - @recordings = sort({ $a->{sse} <=> $b->{sse} } @recordings); - } else { - @recordings = sort({ $b->{sse} <=> $a->{sse} } @recordings); - } - } - my $cur_desc = $desc; - $desc ? ($desc = 0) : ($desc = 1); - - # - my($total, $minutes_total, $free, $minutes_free, $percent) = VideoDiskFree(); - - my $template = TemplateNew("rec_list.html"); - my $vars = { - usercss => $UserCSS, - recloop => \@recordings, - sortbydateurl => "$MyURL?aktion=rec_list&parent=$parent&sortby=date&parent=$parent&desc=" . (($sortby eq "date") ? $desc : $cur_desc), - sortbytimeurl => "$MyURL?aktion=rec_list&parent=$parent&sortby=time&parent=$parent&desc=" . (($sortby eq "time") ? $desc : $cur_desc), - sortbynameurl => "$MyURL?aktion=rec_list&parent=$parent&sortby=name&parent=$parent&desc=" . (($sortby eq "name") ? $desc : $cur_desc), - sortbydate => ($sortby eq "date") ? 1 : 0, - sortbytime => ($sortby eq "time") ? 1 : 0, - sortbyname => ($sortby eq "name") ? 1 : 0, - desc => $desc, - cur_sorting => "&sortby=$sortby&desc=$cur_desc", - disk_total => $total, - disk_free => $free, - disk_percent => $percent, - minutes_free => $minutes_free, - minutes_total => $minutes_total, - path => \@path, - url => $MyURL, - help_url => HelpURL("rec_list"), - reccmds => \@reccmds, - stream_rec_on => $CONFIG{ST_FUNC} && $CONFIG{ST_REC_ON} - }; - $template->param($vars); - my $output; - my $out = $template->output; - $Xtemplate->process(\$out, $vars, \$output) || return(header("500", "text/html", $Xtemplate->error())); - return(header("200", "text/html", $output)); + my @recordings; + + my $desc; + if (!defined($q->param("desc"))) { + $desc = 1; + } else { + $q->param("desc") ? ($desc = 1) : ($desc = 0); + } + my $sortby = $q->param("sortby"); + ($sortby = "name") if (!$sortby); + my $parent = $q->param("parent"); + my $parent2; + if (!$parent) { + $parent = 0; + } else { + $parent = uri_escape($parent); + } + + ParseRecordings($parent, $sortby, $desc); + + # create path array + my @path; + my $fuse = 0; + my $rparent = $parent; + + # printf("PATH: (%s)\n", $parent); + while ($rparent) { + for my $recording (@RECORDINGS) { + if ($recording->{recording_id} eq $rparent) { + push(@path, + { name => $recording->{name}, + url => ($recording->{recording_id} ne $parent) ? sprintf("%s?aktion=rec_list&parent=%s", $MyURL, $recording->{recording_id}) : "" + } + ); + $rparent = $recording->{parent}; + last; + } + } + $fuse++; + last if ($fuse > 100); + } + push(@path, + { name => gettext("Schedule"), + url => ($parent ne 0) ? sprintf("%s?aktion=rec_list&parent=%s", $MyURL, 0) : "" + } + ); + @path = reverse(@path); + + # filter + if (defined($parent)) { + for my $recording (@RECORDINGS) { + if ($recording->{parent} eq $parent) { + push(@recordings, $recording); + } + } + } else { + @recordings = @RECORDINGS; + } + + # + if ($sortby eq "time") { + if (!$desc) { + @recordings = sort({ $b->{time} <=> $a->{time} } @recordings); + } else { + @recordings = sort({ $a->{time} <=> $b->{time} } @recordings); + } + } elsif ($sortby eq "name") { + if (!$desc) { + @recordings = sort({ lc($b->{name}) cmp lc($a->{name}) } @recordings); + } else { + @recordings = sort({ lc($a->{name}) cmp lc($b->{name}) } @recordings); + } + } elsif ($sortby eq "date") { + if (!$desc) { + @recordings = sort({ $a->{sse} <=> $b->{sse} } @recordings); + } else { + @recordings = sort({ $b->{sse} <=> $a->{sse} } @recordings); + } + } + my $cur_desc = $desc; + $desc ? ($desc = 0) : ($desc = 1); + + # + my ($total, $minutes_total, $free, $minutes_free, $percent) = VideoDiskFree(); + + my $template = TemplateNew("rec_list.html"); + my $vars = { usercss => $UserCSS, + recloop => \@recordings, + sortbydateurl => "$MyURL?aktion=rec_list&parent=$parent&sortby=date&parent=$parent&desc=" . (($sortby eq "date") ? $desc : $cur_desc), + sortbytimeurl => "$MyURL?aktion=rec_list&parent=$parent&sortby=time&parent=$parent&desc=" . (($sortby eq "time") ? $desc : $cur_desc), + sortbynameurl => "$MyURL?aktion=rec_list&parent=$parent&sortby=name&parent=$parent&desc=" . (($sortby eq "name") ? $desc : $cur_desc), + sortbydate => ($sortby eq "date") ? 1 : 0, + sortbytime => ($sortby eq "time") ? 1 : 0, + sortbyname => ($sortby eq "name") ? 1 : 0, + desc => $desc, + cur_sorting => "&sortby=$sortby&desc=$cur_desc", + disk_total => $total, + disk_free => $free, + disk_percent => $percent, + minutes_free => $minutes_free, + minutes_total => $minutes_total, + path => \@path, + url => $MyURL, + help_url => HelpURL("rec_list"), + reccmds => \@reccmds, + stream_rec_on => $CONFIG{ST_FUNC} && $CONFIG{ST_REC_ON} + }; + $template->param($vars); + my $output; + my $out = $template->output; + $Xtemplate->process(\$out, $vars, \$output) || return (header("500", "text/html", $Xtemplate->error())); + return (header("200", "text/html", $output)); } sub ParseRecordings { - my $parent = shift; - my $sortby = shift; - my $desc = shift; - - return if((time() - $CONFIG{CACHE_REC_LASTUPDATE}) < ($CONFIG{CACHE_REC_TIMEOUT} * 60)); - - undef @RECORDINGS; - for my $recording (SendCMD("lstr")) { - chomp($recording); - next if(length($recording) == 0); - last if($recording =~ /^No recordings available/); - - my($new); - my($id, $date, $time, $name) = split(/ +/, $recording, 4); + my $parent = shift; + my $sortby = shift; + my $desc = shift; + + return if ((time() - $CONFIG{CACHE_REC_LASTUPDATE}) < ($CONFIG{CACHE_REC_TIMEOUT} * 60)); + + undef @RECORDINGS; + for my $recording (SendCMD("lstr")) { + chomp($recording); + next if (length($recording) == 0); + last if ($recording =~ /^No recordings available/); + + my ($new); + my ($id, $date, $time, $name) = split(/ +/, $recording, 4); + # TODO: support different listing formats of patched VDR 1.2.6 # my($id, $temp) = split(/ /, $recording, 2); # my($date, $time, $name); # print("R: $temp\n"); # if ($temp =~ /(\d\d\.\d\d) (\d\d:\d\d)\*? .*/ ) { -# print("FORMAT1\n"); -# ($date, $time, $name) = split(/ +/, $temp, 3); -# } elsif ($temp =~ /(\d\d\.\d\d)\*? .*/ ) { -# print("FORMAT2\n"); -# ($date, $name) = split(/ +/, $temp, 2); -# } elsif ($temp =~ /(\d\d:\d\d)\*? .*/ ) { -# print("FORMAT3\n"); -# ($time, $name) = split(/ +/, $temp, 2); -# } elsif ($temp =~ /\*? (\d)+. .*/) { -# print("FORMAT4\n"); -# ($new, $time, $name) = split(/ +/, $temp, 3); -# } else { -# print("FORMAT5\n"); -# $name = $temp; -# } - # - if(length($time) > 5) { - $new = 1; - $time = substr($time, 0, 5); - } - - # - my(@tmp, @tmp2, $serie, $episode, $parent); - @tmp = split("~", $name); - @tmp2 = @tmp; -# if($name =~ /~/) { -# @tmp2 = split(" ", $name, 2); -# if(scalar(@tmp2) > 1) { -# if(ord(substr($tmp2[0], length($tmp2[0])-1, 1)) == 180) { -# @tmp = split("~", $tmp2[1]); -# $name = "$tmp2[0] $tmp[scalar(@tmp) - 1]"; -# } else { -# @tmp = split("~", $name); -# $name = $tmp[scalar(@tmp) - 1]; -# } -# } else { -# @tmp = split("~", $name); -# $name = $tmp[scalar(@tmp) - 1]; -# } -# $parent = uri_escape(join("~",@tmp[0, scalar(@tmp) - 2])); -# } - $name = pop(@tmp); - if (@tmp) { - $parent = uri_escape(join("~", @tmp)); - } else { - $parent = 0; - } -# printf("PARENT: (%s) (%s) (%s)\n", scalar(@tmp), $parent, $name); - - # create subfolders - pop(@tmp2); # don't want the recording's name - while (@tmp2) { - my $recording_id = uri_escape(join("~",@tmp2)); - my $recording_name = pop(@tmp2); - my $parent; - if (@tmp2) { - $parent = uri_escape(join("~",@tmp2)); - } else { - $parent = 0; - } -# printf("SUB: (%s) (%s) (%s)\n", $recording_name, $recording_id, $parent); -# } -# for(my $i = 0; $i < scalar(@tmp) - 1; $i++) { -# my $recording_id; -# my $recording_name = $tmp[$i]; -# my $parent; -# printf("REC: (%s) (%s) (%s)\n", $i, join("~",@tmp[0, $i]), join("~",@tmp[0, $i - 1])); -# $recording_id = uri_escape(join("~",@tmp[0, $i])); -# $parent; -# if($i != 0) { -# $parent = uri_escape(join("~",@tmp[0, $i - 1])); -# } else { -# $parent = 0; -# } - - my $found = 0; - for my $recording (@RECORDINGS) { - next if(!$recording->{isfolder}); - if($recording->{recording_id} eq $recording_id && $recording->{parent} eq $parent) { - $found = 1; - } - } - if(!$found) { -# printf("RECLIST %s: (%s) (%s)\n",$recording_name, $recording_id, $parent); - push(@RECORDINGS, { - name => CGI::escapeHTML($recording_name), - recording_id => $recording_id, - parent => $parent, - isfolder => 1, - date => 0, - time => 0, - infurl => sprintf("%s?aktion=rec_list&parent=%s", $MyURL, $recording_id) - }); - } - } - - # - my $yearofrecording; - if ( $VDRVERSION >= 10326 ) { - # let localtime() decide about the century - $yearofrecording = substr($date,6,2); - - # alternatively decide about the century ourself - # my $shortyear = substr($date,6,2); - # if ($shortyear > 70) { - # $yearofrecording = "19" . $shortyear; - # } else { - # $yearofrecording = "20" . $shortyear; - # } - } else { - # old way of vdradmin to handle the date while vdr did not report the year - # current year was assumed. - if ($date eq "29.02") { - $yearofrecording = "2004"; - } else { - $yearofrecording = my_strftime("%Y"); - } - } # endif - - my $name_js = $name; - $name_js =~ s/\'/\\\'/g; - $name_js =~ s/\"/\"/g; - push(@RECORDINGS, { - sse => timelocal(undef, substr($time, 3, 2), substr($time, 0, 2), substr($date, 0, 2), (substr($date, 3, 2)- 1), $yearofrecording), - date => $date, - time => $time, - name => CGI::escapeHTML($name), - name_js => $name_js, - serie => $serie, - episode => $episode, - parent => $parent, - new => $new, - id => $id, - delurl => $MyURL . "?aktion=rec_delete&rec_delete=y&id=$id", - editurl => $MyURL . "?aktion=rec_edit&id=$id", - infurl => $MyURL . "?aktion=rec_detail&id=$id", - streamurl => $MyStreamBase . $CONFIG{REC_EXT} . "?aktion=rec_stream&id=$id", - stream_rec_on => $CONFIG{ST_FUNC} && $CONFIG{ST_REC_ON} - }); - } - - countRecordings(0); - - $CONFIG{CACHE_REC_LASTUPDATE} = time(); +# print("FORMAT1\n"); +# ($date, $time, $name) = split(/ +/, $temp, 3); +# } elsif ($temp =~ /(\d\d\.\d\d)\*? .*/ ) { +# print("FORMAT2\n"); +# ($date, $name) = split(/ +/, $temp, 2); +# } elsif ($temp =~ /(\d\d:\d\d)\*? .*/ ) { +# print("FORMAT3\n"); +# ($time, $name) = split(/ +/, $temp, 2); +# } elsif ($temp =~ /\*? (\d)+. .*/) { +# print("FORMAT4\n"); +# ($new, $time, $name) = split(/ +/, $temp, 3); +# } else { +# print("FORMAT5\n"); +# $name = $temp; +# } + # + if (length($time) > 5) { + $new = 1; + $time = substr($time, 0, 5); + } + + # + my (@tmp, @tmp2, $serie, $episode, $parent); + @tmp = split("~", $name); + @tmp2 = @tmp; + +# if($name =~ /~/) { +# @tmp2 = split(" ", $name, 2); +# if(scalar(@tmp2) > 1) { +# if(ord(substr($tmp2[0], length($tmp2[0])-1, 1)) == 180) { +# @tmp = split("~", $tmp2[1]); +# $name = "$tmp2[0] $tmp[scalar(@tmp) - 1]"; +# } else { +# @tmp = split("~", $name); +# $name = $tmp[scalar(@tmp) - 1]; +# } +# } else { +# @tmp = split("~", $name); +# $name = $tmp[scalar(@tmp) - 1]; +# } +# $parent = uri_escape(join("~",@tmp[0, scalar(@tmp) - 2])); +# } + $name = pop(@tmp); + if (@tmp) { + $parent = uri_escape(join("~", @tmp)); + } else { + $parent = 0; + } + + # printf("PARENT: (%s) (%s) (%s)\n", scalar(@tmp), $parent, $name); + + # create subfolders + pop(@tmp2); # don't want the recording's name + while (@tmp2) { + my $recording_id = uri_escape(join("~", @tmp2)); + my $recording_name = pop(@tmp2); + my $parent; + if (@tmp2) { + $parent = uri_escape(join("~", @tmp2)); + } else { + $parent = 0; + } + +# printf("SUB: (%s) (%s) (%s)\n", $recording_name, $recording_id, $parent); +# } +# for(my $i = 0; $i < scalar(@tmp) - 1; $i++) { +# my $recording_id; +# my $recording_name = $tmp[$i]; +# my $parent; +# printf("REC: (%s) (%s) (%s)\n", $i, join("~",@tmp[0, $i]), join("~",@tmp[0, $i - 1])); +# $recording_id = uri_escape(join("~",@tmp[0, $i])); +# $parent; +# if($i != 0) { +# $parent = uri_escape(join("~",@tmp[0, $i - 1])); +# } else { +# $parent = 0; +# } + + my $found = 0; + for my $recording (@RECORDINGS) { + next if (!$recording->{isfolder}); + if ($recording->{recording_id} eq $recording_id && $recording->{parent} eq $parent) { + $found = 1; + } + } + if (!$found) { + + # printf("RECLIST %s: (%s) (%s)\n",$recording_name, $recording_id, $parent); + push(@RECORDINGS, + { name => CGI::escapeHTML($recording_name), + recording_id => $recording_id, + parent => $parent, + isfolder => 1, + date => 0, + time => 0, + infurl => sprintf("%s?aktion=rec_list&parent=%s", $MyURL, $recording_id) + } + ); + } + } + + # + my $yearofrecording; + if ($VDRVERSION >= 10326) { + + # let localtime() decide about the century + $yearofrecording = substr($date, 6, 2); + + # alternatively decide about the century ourself + # my $shortyear = substr($date,6,2); + # if ($shortyear > 70) { + # $yearofrecording = "19" . $shortyear; + # } else { + # $yearofrecording = "20" . $shortyear; + # } + } else { + + # old way of vdradmin to handle the date while vdr did not report the year + # current year was assumed. + if ($date eq "29.02") { + $yearofrecording = "2004"; + } else { + $yearofrecording = my_strftime("%Y"); + } + } # endif + + my $name_js = $name; + $name_js =~ s/\'/\\\'/g; + $name_js =~ s/\"/\"/g; + push(@RECORDINGS, + { sse => timelocal(undef, substr($time, 3, 2), substr($time, 0, 2), substr($date, 0, 2), (substr($date, 3, 2) - 1), $yearofrecording), + date => $date, + time => $time, + name => CGI::escapeHTML($name), + name_js => $name_js, + serie => $serie, + episode => $episode, + parent => $parent, + new => $new, + id => $id, + delurl => $MyURL . "?aktion=rec_delete&rec_delete=y&id=$id", + editurl => $MyURL . "?aktion=rec_edit&id=$id", + infurl => $MyURL . "?aktion=rec_detail&id=$id", + streamurl => $MyStreamBase . $CONFIG{REC_EXT} . "?aktion=rec_stream&id=$id", + stream_rec_on => $CONFIG{ST_FUNC} && $CONFIG{ST_REC_ON} + } + ); + } + + countRecordings(0); + + $CONFIG{CACHE_REC_LASTUPDATE} = time(); } sub countRecordings { - my $parent = shift; - my $folder = shift; - - for(@RECORDINGS) { - if($_->{parent} eq $parent) { - if($_->{isfolder}) { - countRecordings($_->{recording_id}, $_); - if($folder) { - $folder->{date} += $_->{date}; - $folder->{time} += $_->{time} if($_->{time}); - } - } elsif($folder) { - $folder->{date}++; - $folder->{time}++ if($_->{new}); - } - } - } + my $parent = shift; + my $folder = shift; + + for (@RECORDINGS) { + if ($_->{parent} eq $parent) { + if ($_->{isfolder}) { + countRecordings($_->{recording_id}, $_); + if ($folder) { + $folder->{date} += $_->{date}; + $folder->{time} += $_->{time} if ($_->{time}); + } + } elsif ($folder) { + $folder->{date}++; + $folder->{time}++ if ($_->{new}); + } + } + } } sub getRecInfo { - my $id = shift; - my $ref = shift; - - my($i, $title); - for(SendCMD("lstr")) { - ($i, undef, undef, $title) = split(/ +/, $_, 4); - last if($id == $i); - } - chomp($title); - - my $vars; - if ( $VDRVERSION >= 10325 ) { - $SVDRP->command("lstr $id"); - my($channel_id, $subtitle, $text); - while($_ = $SVDRP->readoneline) { - #if(/^C (.*)/) { $channel_id = $1; } - if(/^T (.*)/) { $title = $1; } - if(/^S (.*)/) { $subtitle = $1; } - if(/^D (.*)/) { $text = $1; } - } - - my $displaytext = CGI::escapeHTML($text); - my $displaytitle = CGI::escapeHTML($title); - my $displaysubtitle = CGI::escapeHTML($subtitle); - my $imdb_title = $title; - - $displaytext =~ s/\n/<br \/>\n/g; - $displaytext =~ s/\|/<br \/>\n/g; - $displaytitle =~ s/\~/ - /g; - $displaytitle =~ s/\n/<br \/>\n/g; - $displaytitle =~ s/\|/<br \/>\n/g; - $displaysubtitle =~ s/\n/<br \/>\n/g; - $displaysubtitle =~ s/\|/<br \/>\n/g; - $imdb_title =~ s/^.*\~\%*([^\~]*)$/$1/; - - $vars = { - url => $MyURL, - usercss => $UserCSS, - text => $displaytext ? $displaytext : undef, - title => $displaytitle ? $displaytitle : undef, - subtitle => $displaysubtitle ? $displaysubtitle : undef, - imdburl => "http://akas.imdb.com/Tsearch?title=" . uri_escape($imdb_title), - id => $id, - referer => $ref ? $ref : undef - }; - } else { - my($text); my($first) = 1; - my($result) = SendCMD("lstr $id"); - if($result !~ /No summary availab/i) { - for(split(/\|/, $result)) { - if($_ ne (split(/\~/, $title))[1] && "%" . $_ ne (split(/\~/, $title))[1] && "@" . $_ ne (split(/\~/, $title))[1]) { - if($first && $title !~ /\~/ && length($title) < 20) { - $title .= "~" . $_; - $first = 0; - } else { - if($text) { - $text .= "<br \/>"; - } - $text .= CGI::escapeHTML("$_ "); - } - } - } - } - my $imdb_title = $title; - $imdb_title =~ s/^.*\~//; - $title =~ s/\~/ - /g; - $vars = { - url => $MyURL, - usercss => $UserCSS, - text => $text ? $text : "", - imdburl => "http://akas.imdb.com/Tsearch?title=" . uri_escape($imdb_title), - title => CGI::escapeHTML($title), - id => $id - }; - } - - return $vars; + my $id = shift; + my $ref = shift; + + my ($i, $title); + for (SendCMD("lstr")) { + ($i, undef, undef, $title) = split(/ +/, $_, 4); + last if ($id == $i); + } + chomp($title); + + my $vars; + if ($VDRVERSION >= 10325) { + $SVDRP->command("lstr $id"); + my ($channel_id, $subtitle, $text); + while ($_ = $SVDRP->readoneline) { + + #if(/^C (.*)/) { $channel_id = $1; } + if (/^T (.*)/) { $title = $1; } + if (/^S (.*)/) { $subtitle = $1; } + if (/^D (.*)/) { $text = $1; } + } + + my $displaytext = CGI::escapeHTML($text); + my $displaytitle = CGI::escapeHTML($title); + my $displaysubtitle = CGI::escapeHTML($subtitle); + my $imdb_title = $title; + + $displaytext =~ s/\n/<br \/>\n/g; + $displaytext =~ s/\|/<br \/>\n/g; + $displaytitle =~ s/\~/ - /g; + $displaytitle =~ s/\n/<br \/>\n/g; + $displaytitle =~ s/\|/<br \/>\n/g; + $displaysubtitle =~ s/\n/<br \/>\n/g; + $displaysubtitle =~ s/\|/<br \/>\n/g; + $imdb_title =~ s/^.*\~\%*([^\~]*)$/$1/; + + $vars = { url => $MyURL, + usercss => $UserCSS, + text => $displaytext ? $displaytext : undef, + title => $displaytitle ? $displaytitle : undef, + subtitle => $displaysubtitle ? $displaysubtitle : undef, + imdburl => "http://akas.imdb.com/Tsearch?title=" . uri_escape($imdb_title), + id => $id, + referer => $ref ? $ref : undef + }; + } else { + my ($text); + my ($first) = 1; + my ($result) = SendCMD("lstr $id"); + if ($result !~ /No summary availab/i) { + for (split(/\|/, $result)) { + if ($_ ne (split(/\~/, $title))[1] && "%" . $_ ne (split(/\~/, $title))[1] && "@" . $_ ne (split(/\~/, $title))[1]) { + if ($first && $title !~ /\~/ && length($title) < 20) { + $title .= "~" . $_; + $first = 0; + } else { + if ($text) { + $text .= "<br \/>"; + } + $text .= CGI::escapeHTML("$_ "); + } + } + } + } + my $imdb_title = $title; + $imdb_title =~ s/^.*\~//; + $title =~ s/\~/ - /g; + $vars = { url => $MyURL, + usercss => $UserCSS, + text => $text ? $text : "", + imdburl => "http://akas.imdb.com/Tsearch?title=" . uri_escape($imdb_title), + title => CGI::escapeHTML($title), + id => $id + }; + } + + return $vars; } sub rec_detail { - my $vars = getRecInfo($q->param('id')); + my $vars = getRecInfo($q->param('id')); - my $template = TemplateNew("prog_detail.html"); - $template->param($vars); - my $output; - my $out = $template->output; - $Xtemplate->process(\$out, $vars, \$output) || return(header("500", "text/html", $Xtemplate->error())); - return(header("200", "text/html", $output)); + my $template = TemplateNew("prog_detail.html"); + $template->param($vars); + my $output; + my $out = $template->output; + $Xtemplate->process(\$out, $vars, \$output) || return (header("500", "text/html", $Xtemplate->error())); + return (header("200", "text/html", $output)); } sub rec_delete { - my($id) = $q->param('id'); - - if ($q->param("rec_delete")) { - if ($id) { - SendCMD("delr $id"); - } else { - for ($q->param) { - if (/xxxx_(.*)/) { - SendCMD("delr $1"); - } - } - } - CloseSocket(); - # Re-read recording's list - $CONFIG{CACHE_REC_LASTUPDATE} = 0; - } elsif ($q->param("rec_runcmd")) { - if ($id) { - recRunCmd($q->param("rec_cmd"), $id); - } else { - for ($q->param) { - if (/xxxx_(.*)/) { - recRunCmd($q->param("rec_cmd"), $1); - } - } - } - } elsif ($q->param("rec_update")) { - # Re-read recording's list - $CONFIG{CACHE_REC_LASTUPDATE} = 0; - } - return(headerForward(RedirectToReferer("$MyURL?aktion=rec_list&sortby=" . $q->param("sortby") . "&desc=" . $q->param("desc")))); + my ($id) = $q->param('id'); + + if ($q->param("rec_delete")) { + if ($id) { + SendCMD("delr $id"); + } else { + for ($q->param) { + if (/xxxx_(.*)/) { + SendCMD("delr $1"); + } + } + } + CloseSocket(); + + # Re-read recording's list + $CONFIG{CACHE_REC_LASTUPDATE} = 0; + } elsif ($q->param("rec_runcmd")) { + if ($id) { + recRunCmd($q->param("rec_cmd"), $id); + } else { + for ($q->param) { + if (/xxxx_(.*)/) { + recRunCmd($q->param("rec_cmd"), $1); + } + } + } + } elsif ($q->param("rec_update")) { + + # Re-read recording's list + $CONFIG{CACHE_REC_LASTUPDATE} = 0; + } + return (headerForward(RedirectToReferer("$MyURL?aktion=rec_list&sortby=" . $q->param("sortby") . "&desc=" . $q->param("desc")))); } sub recRunCmd { - my ($cmdID, $id) = @_; - my $cmd = ${reccmds}[$cmdID]{cmd}; - my ($rec_id, $date, $time, $title); - my ($day, $month, $hour, $minute, $newtitle, $c, $folder); - - for(SendCMD("lstr")) { - ($rec_id, $date, $time, $title) = split(/ +/, $_, 4); - last if($rec_id == $id); - } - - $time = substr($time, 0, 5); # needed for wareagel-patch - if ($rec_id == $id) { - chomp($title); - ($day, $month)= split( /\./, $date); - ($hour, $minute)= split( /:/, $time); - # escape characters - if( $CONFIG{VDRVFAT} > 0 ) { - for ( my $i=0 ;$ i < length($title); $i++) { - $c = substr($title,$i,1); - unless ($c =~ /[öäüßÖÄÜA-Za-z0123456789_!@\$%&()+,.\-;=~ ]/) { - $newtitle.= sprintf( "#%02X", ord( $c )); - } else { - $newtitle.= $c; - } - } - } else { - for ( my $i=0 ;$ i < length($title); $i++) { - $c = substr($title,$i,1); - if ($c eq "/" ) { - $newtitle.= "\x02"; - } elsif ($c eq "\\" ) { - $newtitle.= "\x01"; - } else { - $newtitle.= $c; - } - } - } - $title=$newtitle; - $title =~ s/ /_/g; - $title =~ s/~/\//g; - $folder = `find $CONFIG{VIDEODIR}/ -regex "$CONFIG{VIDEODIR}/$title\_*/\\(\_/\\)?....-$month-$day\\.$hour.$minute\\...\\...\\.rec"`; - print("CMD: find $CONFIG{VIDEODIR}/ -regex \"$CONFIG{VIDEODIR}/$title\_*/\\(\_/\\)?....-$month-$day\\.$hour.$minute\\...\\...\\.rec\"\n"); - - if ($folder) { - chomp($folder); - print("FOUND: $folder\n"); - `$cmd "$folder"`; - } - } + my ($cmdID, $id) = @_; + my $cmd = ${reccmds}[$cmdID]{cmd}; + my ($rec_id, $date, $time, $title); + my ($day, $month, $hour, $minute, $newtitle, $c, $folder); + + for (SendCMD("lstr")) { + ($rec_id, $date, $time, $title) = split(/ +/, $_, 4); + last if ($rec_id == $id); + } + + $time = substr($time, 0, 5); # needed for wareagel-patch + if ($rec_id == $id) { + chomp($title); + ($day, $month) = split(/\./, $date); + ($hour, $minute) = split(/:/, $time); + + # escape characters + if ($CONFIG{VDRVFAT} > 0) { + for (my $i = 0 ; $i < length($title) ; $i++) { + $c = substr($title, $i, 1); + unless ($c =~ /[öäüßÖÄÜA-Za-z0123456789_!@\$%&()+,.\-;=~ ]/) { + $newtitle .= sprintf("#%02X", ord($c)); + } else { + $newtitle .= $c; + } + } + } else { + for (my $i = 0 ; $i < length($title) ; $i++) { + $c = substr($title, $i, 1); + if ($c eq "/") { + $newtitle .= "\x02"; + } elsif ($c eq "\\") { + $newtitle .= "\x01"; + } else { + $newtitle .= $c; + } + } + } + $title = $newtitle; + $title =~ s/ /_/g; + $title =~ s/~/\//g; + $folder = `find $CONFIG{VIDEODIR}/ -regex "$CONFIG{VIDEODIR}/$title\_*/\\(\_/\\)?....-$month-$day\\.$hour.$minute\\...\\...\\.rec"`; + print("CMD: find $CONFIG{VIDEODIR}/ -regex \"$CONFIG{VIDEODIR}/$title\_*/\\(\_/\\)?....-$month-$day\\.$hour.$minute\\...\\...\\.rec\"\n"); + + if ($folder) { + chomp($folder); + print("FOUND: $folder\n"); + `$cmd "$folder"`; + } + } } sub rec_edit { - # determine referer (redirect to where we come from) - my $ref = getReferer(); - - my $template = TemplateNew("rec_edit.html"); - my $vars = getRecInfo($q->param("id"), $ref ? Encode_Referer($ref) : undef); - $template->param($vars); - my $output; - my $out = $template->output; - $Xtemplate->process(\$out, $vars, \$output) || return(header("500", "text/html", $Xtemplate->error())); - return(header("200", "text/html", $output)); + + # determine referer (redirect to where we come from) + my $ref = getReferer(); + + my $template = TemplateNew("rec_edit.html"); + my $vars = getRecInfo($q->param("id"), $ref ? Encode_Referer($ref) : undef); + $template->param($vars); + my $output; + my $out = $template->output; + $Xtemplate->process(\$out, $vars, \$output) || return (header("500", "text/html", $Xtemplate->error())); + return (header("200", "text/html", $output)); } sub rec_rename { - my($id) = $q->param('id'); - my($nn) = $q->param('nn'); - if($id) { - SendCMD("RENR $id $nn"); - CloseSocket(); - # Re-read recording's list - $CONFIG{CACHE_REC_LASTUPDATE} = 0; - } - - my $ref = getReferer(); - if($ref) { - return headerForward($ref); - } else { - return headerForward("$MyURL?aktion=rec_list&sortby=" . $q->param("sortby") . "&desc=" . $q->param("desc")); - } + my ($id) = $q->param('id'); + my ($nn) = $q->param('nn'); + if ($id) { + SendCMD("RENR $id $nn"); + CloseSocket(); + + # Re-read recording's list + $CONFIG{CACHE_REC_LASTUPDATE} = 0; + } + + my $ref = getReferer(); + if ($ref) { + return headerForward($ref); + } else { + return headerForward("$MyURL?aktion=rec_list&sortby=" . $q->param("sortby") . "&desc=" . $q->param("desc")); + } } ############################################################################# # configuration ############################################################################# sub config { - sub ApplyConfig { - my $old_lang = $CONFIG{LANG}; - my $old_epgprune = $CONFIG{EPG_PRUNE}; - my $old_epgdirect = $CONFIG{EPG_DIRECT}; - my $old_epgfile = $CONFIG{EPG_FILENAME}; - my $old_vdrconfdir = $CONFIG{VDRCONFDIR}; - - for($q->param) { - if(/[A-Z]+/) { - $CONFIG{$_} = $q->param($_); - } - } - - $CONFIG{TV_MIMETYPE}="video/x-mpegurl" if(!$CONFIG{TV_MIMETYPE}); - $CONFIG{TV_EXT}="m3u" if(!$CONFIG{TV_EXT}); - $CONFIG{REC_MIMETYPE}="video/x-mpegurl" if(!$CONFIG{REC_MIMETYPE}); - $CONFIG{REC_EXT}="m3u" if(!$CONFIG{REC_EXT}); - LoadTranslation() if($old_lang ne $CONFIG{LANG}); - UptoDate(1) if($old_epgprune != $CONFIG{EPG_PRUNE} || $old_epgdirect != $CONFIG{EPG_DIRECT} || $old_epgfile ne $CONFIG{EPG_FILENAME}); - if($old_vdrconfdir ne $CONFIG{VDRCONFDIR}) { - @reccmds = loadCommandsConf("$CONFIG{VDRCONFDIR}/reccmds.conf"); - @vdrcmds = loadCommandsConf("$CONFIG{VDRCONFDIR}/commands.conf"); - } - } - - sub WriteConfig { - open(CONF, ">$CONFFILE") || print "Can't open $CONFFILE! ($!)\n"; - for my $key (sort(keys(%CONFIG))) { - print CONF "$key = $CONFIG{$key}\n"; - } - close(CONF); - } - - if($q->param("submit")) { - if($q->param("submit") eq ">>>>>") { - for my $vdr_id ($q->param("all_channels")) { - $CONFIG{CHANNELS_WANTED} = csvAdd($CONFIG{CHANNELS_WANTED}, $vdr_id); - } - ApplyConfig(); WriteConfig(); - } elsif($q->param("submit") eq "<<<<<") { - for my $vdr_id ($q->param("selected_channels")) { - $CONFIG{CHANNELS_WANTED} = csvRemove($CONFIG{CHANNELS_WANTED}, $vdr_id); - } - ApplyConfig(); WriteConfig(); - } - } elsif($q->param("save")) { - ApplyConfig(); WriteConfig(); - } elsif($q->param("apply")) { - ApplyConfig(); - } - - # - my @LOGINPAGES_DESCRIPTION = ( - gettext("What's On Now?"), - gettext("Playing Today?"), - gettext("Timeline"), - gettext("Channels"), - gettext("Timers"), - gettext("Recordings") - ); - my(@loginpages); - my $i = 0; - for my $loginpage (@LOGINPAGES) { - push(@loginpages, { - id => $i, - name => $LOGINPAGES_DESCRIPTION[$i], - current => ($CONFIG{LOGINPAGE} == $i) ? 1 : 0 - }); - $i++; - } - - # - my @template; - for my $dir (<$TEMPLATEDIR/*>) { - next if(!-d $dir); - $dir =~ s/.*\///g; - my $found = 0; - for(@template) { ($found = 1) if($1 && ($_->{name} eq $1)); } - if(!$found) { - push(@template, { - name => $dir, - aktemplate => ($CONFIG{TEMPLATE} eq $dir) ? 1 : 0, - }); - } - } - - # - my (@all_channels, @selected_channels); - for my $channel (@CHAN) { + + sub ApplyConfig { + my $old_lang = $CONFIG{LANG}; + my $old_epgprune = $CONFIG{EPG_PRUNE}; + my $old_epgdirect = $CONFIG{EPG_DIRECT}; + my $old_epgfile = $CONFIG{EPG_FILENAME}; + my $old_vdrconfdir = $CONFIG{VDRCONFDIR}; + + for ($q->param) { + if (/[A-Z]+/) { + $CONFIG{$_} = $q->param($_); + } + } + + $CONFIG{TV_MIMETYPE} = "video/x-mpegurl" if (!$CONFIG{TV_MIMETYPE}); + $CONFIG{TV_EXT} = "m3u" if (!$CONFIG{TV_EXT}); + $CONFIG{REC_MIMETYPE} = "video/x-mpegurl" if (!$CONFIG{REC_MIMETYPE}); + $CONFIG{REC_EXT} = "m3u" if (!$CONFIG{REC_EXT}); + LoadTranslation() if ($old_lang ne $CONFIG{LANG}); + UptoDate(1) if ($old_epgprune != $CONFIG{EPG_PRUNE} || $old_epgdirect != $CONFIG{EPG_DIRECT} || $old_epgfile ne $CONFIG{EPG_FILENAME}); + if ($old_vdrconfdir ne $CONFIG{VDRCONFDIR}) { + @reccmds = loadCommandsConf("$CONFIG{VDRCONFDIR}/reccmds.conf"); + @vdrcmds = loadCommandsConf("$CONFIG{VDRCONFDIR}/commands.conf"); + } + } + + sub WriteConfig { + open(CONF, ">$CONFFILE") || print "Can't open $CONFFILE! ($!)\n"; + for my $key (sort(keys(%CONFIG))) { + print CONF "$key = $CONFIG{$key}\n"; + } + close(CONF); + } + + if ($q->param("submit")) { + if ($q->param("submit") eq ">>>>>") { + for my $vdr_id ($q->param("all_channels")) { + $CONFIG{CHANNELS_WANTED} = csvAdd($CONFIG{CHANNELS_WANTED}, $vdr_id); + } + ApplyConfig(); + WriteConfig(); + } elsif ($q->param("submit") eq "<<<<<") { + for my $vdr_id ($q->param("selected_channels")) { + $CONFIG{CHANNELS_WANTED} = csvRemove($CONFIG{CHANNELS_WANTED}, $vdr_id); + } + ApplyConfig(); + WriteConfig(); + } + } elsif ($q->param("save")) { + ApplyConfig(); + WriteConfig(); + } elsif ($q->param("apply")) { + ApplyConfig(); + } + # - push(@all_channels, { - name => $channel->{name}, - vdr_id => $channel->{vdr_id} - }); + my @LOGINPAGES_DESCRIPTION = (gettext("What's On Now?"), gettext("Playing Today?"), gettext("Timeline"), gettext("Channels"), gettext("Timers"), gettext("Recordings")); + my (@loginpages); + my $i = 0; + for my $loginpage (@LOGINPAGES) { + push(@loginpages, + { id => $i, + name => $LOGINPAGES_DESCRIPTION[$i], + current => ($CONFIG{LOGINPAGE} == $i) ? 1 : 0 + } + ); + $i++; + } # - my $found = 0; - for(split(",", $CONFIG{CHANNELS_WANTED})) { - if($_ eq $channel->{vdr_id}) { - $found = 1; - } - } - next if !$found; - push(@selected_channels, { - name => $channel->{name}, - vdr_id => $channel->{vdr_id} - }); - } - - my @skinlist; - foreach my $file (glob(sprintf("%s/%s/*",$TEMPLATEDIR, $CONFIG{TEMPLATE}))) { - my $name = (split('\/', $file))[-1]; - push(@skinlist,{ - name => $name, - sel => ($CONFIG{SKIN} eq $name ? 1 : 0) - }) if(-d $file); - } - - my @my_locales; - if( -e "/usr/bin/locale" ) { - push(@my_locales, {id => "", name => gettext("System default"), cur => 0}); - foreach my $loc (locale("-a")) { - chomp $loc; - push(@my_locales, { - id => $loc, - name => $loc, - cur => ($loc eq $CONFIG{LANG} ? 1 : 0) - }) if ($loc =~ $SUPPORTED_LOCALE_PREFIXES); - } - } - - my $template = TemplateNew("config.html"); - my $vars = { - usercss => $UserCSS, - %CONFIG, - TEMPLATELIST => \@template, - ALL_CHANNELS => \@all_channels, - SELECTED_CHANNELS => \@selected_channels, - LOGINPAGES => \@loginpages, - SKINLIST => \@skinlist, - MY_LOCALES => \@my_locales, - url => $MyURL, - help_url => HelpURL("config") - }; - $template->param($vars); - my $output; - my $out = $template->output; - $Xtemplate->process(\$out, $vars, \$output) || return(header("500", "text/html", $Xtemplate->error())); - return(header("200", "text/html", $output)); + my @template; + for my $dir (<$TEMPLATEDIR/*>) { + next if (!-d $dir); + $dir =~ s/.*\///g; + my $found = 0; + for (@template) { ($found = 1) if ($1 && ($_->{name} eq $1)); } + if (!$found) { + push(@template, + { name => $dir, + aktemplate => ($CONFIG{TEMPLATE} eq $dir) ? 1 : 0, + } + ); + } + } + + # + my (@all_channels, @selected_channels); + for my $channel (@CHAN) { + + # + push(@all_channels, + { name => $channel->{name}, + vdr_id => $channel->{vdr_id} + } + ); + + # + my $found = 0; + for (split(",", $CONFIG{CHANNELS_WANTED})) { + if ($_ eq $channel->{vdr_id}) { + $found = 1; + } + } + next if !$found; + push(@selected_channels, + { name => $channel->{name}, + vdr_id => $channel->{vdr_id} + } + ); + } + + my @skinlist; + foreach my $file (glob(sprintf("%s/%s/*", $TEMPLATEDIR, $CONFIG{TEMPLATE}))) { + my $name = (split('\/', $file))[-1]; + push(@skinlist, + { name => $name, + sel => ($CONFIG{SKIN} eq $name ? 1 : 0) + } + ) + if (-d $file); + } + + my @my_locales; + if (-f "/usr/bin/locale" && -x "/usr/bin/locale") { + push(@my_locales, { id => "", name => gettext("System default"), cur => 0 }); + foreach my $loc (locale("-a")) { + chomp $loc; + push(@my_locales, + { id => $loc, + name => $loc, + cur => ($loc eq $CONFIG{LANG} ? 1 : 0) + } + ) + if ($loc =~ $SUPPORTED_LOCALE_PREFIXES); + } + } + + my $template = TemplateNew("config.html"); + my $vars = { usercss => $UserCSS, + %CONFIG, + TEMPLATELIST => \@template, + ALL_CHANNELS => \@all_channels, + SELECTED_CHANNELS => \@selected_channels, + LOGINPAGES => \@loginpages, + SKINLIST => \@skinlist, + MY_LOCALES => \@my_locales, + url => $MyURL, + help_url => HelpURL("config") + }; + $template->param($vars); + my $output; + my $out = $template->output; + $Xtemplate->process(\$out, $vars, \$output) || return (header("500", "text/html", $Xtemplate->error())); + return (header("200", "text/html", $output)); } ############################################################################# # remote control ############################################################################# sub rc_show { - my $template = TemplateNew("rc.html"); - my $vars = { - usercss => $UserCSS, - url => sprintf("%s?aktion=grab_picture", $MyURL), - host => $CONFIG{VDR_HOST} - }; - $template->param($vars); - my $output; - my $out = $template->output; - $Xtemplate->process(\$out, $vars, \$output) || return(header("500", "text/html", $Xtemplate->error())); - return(header("200", "text/html", $output)); + my $template = TemplateNew("rc.html"); + my $vars = { usercss => $UserCSS, + url => sprintf("%s?aktion=grab_picture", $MyURL), + host => $CONFIG{VDR_HOST} + }; + $template->param($vars); + my $output; + my $out = $template->output; + $Xtemplate->process(\$out, $vars, \$output) || return (header("500", "text/html", $Xtemplate->error())); + return (header("200", "text/html", $output)); } sub rc_hitk { - my $key = $q->param("key"); - if($key eq "VolumePlus") { - $key = "Volume+"; - } - if($key eq "VolumeMinus") { - $key = "Volume-"; - } - SendCMD("hitk $key"); - #XXX - SendFile("bilder/spacer.gif"); + my $key = $q->param("key"); + if ($key eq "VolumePlus") { + $key = "Volume+"; + } + if ($key eq "VolumeMinus") { + $key = "Volume-"; + } + SendCMD("hitk $key"); + + #XXX + SendFile("bilder/spacer.gif"); } sub tv_show { - my ($cur_channel_id, $cur_channel_name); - for(SendCMD("chan")) { - ($cur_channel_id, $cur_channel_name) = split(" ", $_, 2); - } - - my @chans; - for my $chan (@CHAN) { - if($CONFIG{CHANNELS_WANTED_WATCHTV}) { - my $found = 0; - for my $n (split(",", $CONFIG{CHANNELS_WANTED})) { - ($found = 1) if($n eq $chan->{vdr_id}); - } - next if(!$found); - } - if($chan->{vdr_id}) { - $chan->{cur} = ($chan->{vdr_id} == $cur_channel_id) ? 1 : 0; - } - push(@chans, $chan); - } - - my $template = TemplateNew("tv.html"); - my $vars = { - tv_only => $q->param("tv_only") ? $q->param("tv_only") : undef, - interval => $q->param("interval") ? $q->param("interval") : 5, - size => $q->param("size") ? $q->param("size") : "half", - usercss => $UserCSS, - new_win => ($q->param("new_win") && $q->param("new_win") eq "1") ? "1" : undef, - url => sprintf("%s?aktion=grab_picture", $MyURL), - channels => \@chans, - host => $CONFIG{VDR_HOST} - }; - $template->param($vars); - my $output; - my $out = $template->output; - $Xtemplate->process(\$out, $vars, \$output) || return(header("500", "text/html", $Xtemplate->error())); - return(header("200", "text/html", $output)); + my ($cur_channel_id, $cur_channel_name); + for (SendCMD("chan")) { + ($cur_channel_id, $cur_channel_name) = split(" ", $_, 2); + } + + my @chans; + for my $chan (@CHAN) { + if ($CONFIG{CHANNELS_WANTED_WATCHTV}) { + my $found = 0; + for my $n (split(",", $CONFIG{CHANNELS_WANTED})) { + ($found = 1) if ($n eq $chan->{vdr_id}); + } + next if (!$found); + } + if ($chan->{vdr_id}) { + $chan->{cur} = ($chan->{vdr_id} == $cur_channel_id) ? 1 : 0; + } + push(@chans, $chan); + } + + my $template = TemplateNew("tv.html"); + my $vars = { tv_only => $q->param("tv_only") ? $q->param("tv_only") : undef, + interval => $q->param("interval") ? $q->param("interval") : 5, + size => $q->param("size") ? $q->param("size") : "half", + usercss => $UserCSS, + new_win => ($q->param("new_win") && $q->param("new_win") eq "1") ? "1" : undef, + url => sprintf("%s?aktion=grab_picture", $MyURL), + channels => \@chans, + host => $CONFIG{VDR_HOST} + }; + $template->param($vars); + my $output; + my $out = $template->output; + $Xtemplate->process(\$out, $vars, \$output) || return (header("500", "text/html", $Xtemplate->error())); + return (header("200", "text/html", $output)); } sub tv_switch { - my $channel = $q->param("channel"); - if($channel) { - SendCMD("chan $channel"); - } + my $channel = $q->param("channel"); + if ($channel) { + SendCMD("chan $channel"); + } } sub show_help { - my $area = $q->param("area"); - my $filename = "help_" . $area . ".html"; - $CONFIG{TEMPLATE} = "default" if(!$CONFIG{TEMPLATE}); - if(!-e "$TEMPLATEDIR/$CONFIG{TEMPLATE}/$filename") { - $filename = "help_no.html"; - } - my $template = TemplateNew($filename); - my $vars = { - usercss => $UserCSS, - area => $area - }; - $template->param($vars); - my $output; - my $out = $template->output; - $Xtemplate->process(\$out, $vars, \$output) || return(header("500", "text/html", $Xtemplate->error())); - return(header("200", "text/html", $output)); + my $area = $q->param("area"); + my $filename = "help_" . $area . ".html"; + $CONFIG{TEMPLATE} = "default" if (!$CONFIG{TEMPLATE}); + if (!-e "$TEMPLATEDIR/$CONFIG{TEMPLATE}/$filename") { + $filename = "help_no.html"; + } + my $template = TemplateNew($filename); + my $vars = { usercss => $UserCSS, + area => $area + }; + $template->param($vars); + my $output; + my $out = $template->output; + $Xtemplate->process(\$out, $vars, \$output) || return (header("500", "text/html", $Xtemplate->error())); + return (header("200", "text/html", $output)); } ############################################################################# # information ############################################################################# sub about { - my $template = TemplateNew("about.html"); - my $vars = { - vdrversion => $VDRVERSION_HR, - myversion => $VERSION, - usercss => $UserCSS - }; - $template->param($vars); - my $output; - my $out = $template->output; - $Xtemplate->process(\$out, $vars, \$output) || return(header("500", "text/html", $Xtemplate->error())); - return(header("200", "text/html", $output)); + my $template = TemplateNew("about.html"); + my $vars = { vdrversion => $VDRVERSION_HR, + myversion => $VERSION, + usercss => $UserCSS + }; + $template->param($vars); + my $output; + my $out = $template->output; + $Xtemplate->process(\$out, $vars, \$output) || return (header("500", "text/html", $Xtemplate->error())); + return (header("200", "text/html", $output)); } ############################################################################# # experimental ############################################################################# sub grab_picture { - my $size = $q->param("size") ? $q->param("size") : "half"; - my $maxwidth = 768; - my $maxheight = 576; - my($width, $height); - if($size eq "full") { - ($width, $height) = ($maxwidth, $maxheight); - } elsif($size eq "half") { - ($width, $height) = ($maxwidth / 2, $maxheight / 2); - } elsif($size eq "quarter") { - ($width, $height) = ($maxwidth / 4, $maxheight / 4); - } else { - ($width, $height) = ($maxwidth / 4, $maxheight / 4); - } - - if ($VDRVERSION < 10338) { - # Grab using temporary file - my $file = new File::Temp(TEMPLATE => "vdr-XXXXX", DIR => File::Spec->tmpdir(), UNLINK => 1, SUFFIX => ".jpg"); - chmod 0666,$file if(-e $file); - SendCMD("grab $file jpeg 70 $width $height"); - if(-e $file && -r $file) { - return(header("200", "image/jpeg", ReadFile($file))); - } else { - print "Expected $file does not exist.\n"; - print "Obviously VDR Admin could not find the screenshot file. Ensure that:\n"; - print " - VDR has the rights to write $file\n"; - print " - VDR and VDR Admin run on the same machine\n"; - print " - VDR Admin may read $file\n"; - print " - VDR has access to /dev/video* files\n"; - print " - you have a full featured card\n"; - return SendFile("bilder/spacer.gif"); - } - } else { - my $image; - for (SendCMD("grab .jpg 70 $width $height")) { - $image .= $_ unless(/Grabbed image/); - } - return SendFile("bilder/noise.gif") if($image =~ /Grab image failed/); - return(header("200", "image/jpeg", MIME::Base64::decode_base64($image))); - } + my $size = $q->param("size") ? $q->param("size") : "half"; + my $maxwidth = 768; + my $maxheight = 576; + my ($width, $height); + if ($size eq "full") { + ($width, $height) = ($maxwidth, $maxheight); + } elsif ($size eq "half") { + ($width, $height) = ($maxwidth / 2, $maxheight / 2); + } elsif ($size eq "quarter") { + ($width, $height) = ($maxwidth / 4, $maxheight / 4); + } else { + ($width, $height) = ($maxwidth / 4, $maxheight / 4); + } + + if ($VDRVERSION < 10338) { + + # Grab using temporary file + my $file = new File::Temp(TEMPLATE => "vdr-XXXXX", DIR => File::Spec->tmpdir(), UNLINK => 1, SUFFIX => ".jpg"); + chmod 0666, $file if (-e $file); + SendCMD("grab $file jpeg 70 $width $height"); + if (-e $file && -r $file) { + return (header("200", "image/jpeg", ReadFile($file))); + } else { + print "Expected $file does not exist.\n"; + print "Obviously VDR Admin could not find the screenshot file. Ensure that:\n"; + print " - VDR has the rights to write $file\n"; + print " - VDR and VDR Admin run on the same machine\n"; + print " - VDR Admin may read $file\n"; + print " - VDR has access to /dev/video* files\n"; + print " - you have a full featured card\n"; + return SendFile("bilder/spacer.gif"); + } + } else { + my $image; + for (SendCMD("grab .jpg 70 $width $height")) { + $image .= $_ unless (/Grabbed image/); + } + return SendFile("bilder/noise.gif") if ($image =~ /Grab image failed/); + return (header("200", "image/jpeg", MIME::Base64::decode_base64($image))); + } } sub force_update { - UptoDate(1); - RedirectToReferer("$MyURL?aktion=prog_summary"); + UptoDate(1); + RedirectToReferer("$MyURL?aktion=prog_summary"); } sub isLinVDR { - my $file = "/etc/linvdr-release"; - my $content; - if(-e $file) { - open(FILE, $file); - $content = <FILE>; - chomp($content); - close(FILE); - } - return($content); + my $file = "/etc/linvdr-release"; + my $content; + if (-e $file) { + open(FILE, $file); + $content = <FILE>; + chomp($content); + close(FILE); + } + return ($content); } sub loadCommandsConf { - my $conf_file = shift; - my @commands; - my $id = 0; - if(-e $conf_file and my $text = open(FH, $conf_file)) { - while(<FH>) { - chomp; - s/#.*//; - s/^\s+//; - s/\s+$//; - next unless length; - my ($title, $cmd) = split(":", $_); - push(@commands, {title => $title, cmd => $cmd, id => $id}); - $id = $id + 1; - } - close(FH); - } - return @commands; + my $conf_file = shift; + my @commands; + my $id = 0; + if (-e $conf_file and my $text = open(FH, $conf_file)) { + while (<FH>) { + chomp; + s/#.*//; + s/^\s+//; + s/\s+$//; + next unless length; + my ($title, $cmd) = split(":", $_); + push(@commands, { title => $title, cmd => $cmd, id => $id }); + $id = $id + 1; + } + close(FH); + } + return @commands; } sub vdr_cmds { - my @show_output; - @show_output = run_vdrcmd() if($q->param("run_vdrcmd")); - @show_output = run_svdrpcmd() if($q->param("run_svdrpcmd")); - my $svdrp_cmd = "help"; - $svdrp_cmd = $q->param("svdrp_cmd") if($q->param("svdrp_cmd")); - my $template = TemplateNew("vdr_cmds.html"); - my $vars = { - url => sprintf("%s?aktion=vdr_cmds", $MyURL), - commands => \@vdrcmds, - show_output => \@show_output, - max_lines => $q->param("max_lines") ? $q->param("max_lines") : 20, - svdrp_cmd => $svdrp_cmd, - vdr_cmd => $q->param("vdr_cmd") ? $q->param("vdr_cmd") : undef, - usercss => $UserCSS - }; - $template->param($vars); - my $output; - my $out = $template->output; - $Xtemplate->process(\$out, $vars, \$output) || return(header("500", "text/html", $Xtemplate->error())); - return(header("200", "text/html", $output)); + my @show_output; + @show_output = run_vdrcmd() if ($q->param("run_vdrcmd")); + @show_output = run_svdrpcmd() if ($q->param("run_svdrpcmd")); + my $svdrp_cmd = "help"; + $svdrp_cmd = $q->param("svdrp_cmd") if ($q->param("svdrp_cmd")); + my $template = TemplateNew("vdr_cmds.html"); + my $vars = { + url => sprintf("%s?aktion=vdr_cmds", $MyURL), + commands => \@vdrcmds, + show_output => \@show_output, + max_lines => $q->param("max_lines") ? $q->param("max_lines") : 20, + svdrp_cmd => $svdrp_cmd, + vdr_cmd => $q->param("vdr_cmd") ? $q->param("vdr_cmd") : undef, + usercss => $UserCSS + }; + $template->param($vars); + my $output; + my $out = $template->output; + $Xtemplate->process(\$out, $vars, \$output) || return (header("500", "text/html", $Xtemplate->error())); + return (header("200", "text/html", $output)); } sub run_vdrcmd { - my $id = $q->param("vdr_cmd"); - my $max_lines = $q->param("max_lines"); - return unless($id); - my $counter = 1; - my $cmd = ${vdrcmds}[$id]{cmd}; - my @output; - open(FH, "$cmd |") or return; - while(<FH>) { - chomp; - push(@output, {line => $_}); - last if($max_lines > 0 && $counter >= $max_lines); - $counter++; - } - close(FH); - return @output; + my $id = $q->param("vdr_cmd"); + my $max_lines = $q->param("max_lines"); + return unless ($id); + my $counter = 1; + my $cmd = ${vdrcmds}[$id]{cmd}; + my @output; + open(FH, "$cmd |") or return; + while (<FH>) { + chomp; + push(@output, { line => $_ }); + last if ($max_lines > 0 && $counter >= $max_lines); + $counter++; + } + close(FH); + return @output; } sub run_svdrpcmd { - my $id = $q->param("svdrp_cmd"); - my $max_lines = $q->param("max_lines"); - return unless($id); - my $counter = 1; - my @output; - for(SendCMD($q->param("svdrp_cmd"))) { - push(@output, {line => $_}); - last if($max_lines > 0 && $counter >= $max_lines); - $counter++; - } - return @output; + my $id = $q->param("svdrp_cmd"); + my $max_lines = $q->param("max_lines"); + return unless ($id); + my $counter = 1; + my @output; + for (SendCMD($q->param("svdrp_cmd"))) { + push(@output, { line => $_ }); + last if ($max_lines > 0 && $counter >= $max_lines); + $counter++; + } + return @output; } ############################################################################# @@ -4907,26 +4922,25 @@ sub run_svdrpcmd { ############################################################################# sub subnetcheck { - my $ip=$_[0]; - my $net=$_[1]; - my ($ip1,$ip2,$ip3,$ip4,$net_base,$net_range,$net_base1,$net_base2, - $net_base3,$net_base4,$bin_ip,$bin_net); + my $ip = $_[0]; + my $net = $_[1]; + my ($ip1, $ip2, $ip3, $ip4, $net_base, $net_range, $net_base1, $net_base2, $net_base3, $net_base4, $bin_ip, $bin_net); - ($ip1,$ip2,$ip3,$ip4) = split(/\./,$ip); - ($net_base,$net_range) = split(/\//,$net); - ($net_base1,$net_base2,$net_base3,$net_base4) = split(/\./,$net_base); + ($ip1, $ip2, $ip3, $ip4) = split(/\./, $ip); + ($net_base, $net_range) = split(/\//, $net); + ($net_base1, $net_base2, $net_base3, $net_base4) = split(/\./, $net_base); - $bin_ip = unpack("B*", pack("C", $ip1)); + $bin_ip = unpack("B*", pack("C", $ip1)); $bin_ip .= unpack("B*", pack("C", $ip2)); $bin_ip .= unpack("B*", pack("C", $ip3)); $bin_ip .= unpack("B*", pack("C", $ip4)); - $bin_net = unpack("B*", pack("C", $net_base1)); + $bin_net = unpack("B*", pack("C", $net_base1)); $bin_net .= unpack("B*", pack("C", $net_base2)); $bin_net .= unpack("B*", pack("C", $net_base3)); $bin_net .= unpack("B*", pack("C", $net_base4)); - if (substr($bin_ip,0,$net_range) eq substr($bin_net,0,$net_range)) { + if (substr($bin_ip, 0, $net_range) eq substr($bin_net, 0, $net_range)) { return 1; } else { return 0; @@ -4938,121 +4952,123 @@ sub subnetcheck { ############################################################################# package SVDRP; -sub true () { main::true(); } -sub false () { main::false(); }; -sub LOG_VDRCOM () { main::LOG_VDRCOM(); }; -sub CRLF () { main::CRLF(); }; +sub true () { main::true(); } +sub false () { main::false(); } +sub LOG_VDRCOM () { main::LOG_VDRCOM(); } +sub CRLF () { main::CRLF(); } -my($SOCKET, $EPGSOCKET, $query, $connected, $epg); +my ($SOCKET, $EPGSOCKET, $query, $connected, $epg); sub new { - my $invocant = shift; - my $class = ref($invocant) || $invocant; - my $self = { }; - bless($self, $class); - $connected = false; - $query = false; - $epg = false; - return $self; + my $invocant = shift; + my $class = ref($invocant) || $invocant; + my $self = {}; + bless($self, $class); + $connected = false; + $query = false; + $epg = false; + return $self; } sub myconnect { - my $this = shift; - if ($epg && $CONFIG{EPG_DIRECT}) { - main::Log(LOG_VDRCOM, "LOG_VDRCOM: open EPG $CONFIG{EPG_FILENAME}"); - open($EPGSOCKET,$CONFIG{EPG_FILENAME}) || main::HTMLError(sprintf($ERROR_MESSAGE{cant_open}, $CONFIG{EPG_FILENAME})); - return; - } - main::Log(LOG_VDRCOM, "LOG_VDRCOM: connect to $CONFIG{VDR_HOST}:$CONFIG{VDR_PORT}"); - - $SOCKET = IO::Socket::INET->new( - PeerAddr => $CONFIG{VDR_HOST}, - PeerPort => $CONFIG{VDR_PORT}, - Proto => 'tcp' - ) || main::HTMLError(sprintf($ERROR_MESSAGE{connect_failed}, $CONFIG{VDR_HOST}, $CONFIG{VDR_PORT})) && return; - - my $line; - $line = <$SOCKET>; - if ( ! $VDRVERSION ) { - $line =~ /^220.*VideoDiskRecorder (.*)\.(.*)\.(.*);/; - $VDRVERSION_HR = "$1.$2.$3"; - $VDRVERSION = ($1*10000+$2*100+$3); - } - $connected = true; + my $this = shift; + if ($epg && $CONFIG{EPG_DIRECT}) { + main::Log(LOG_VDRCOM, "LOG_VDRCOM: open EPG $CONFIG{EPG_FILENAME}"); + open($EPGSOCKET, $CONFIG{EPG_FILENAME}) || main::HTMLError(sprintf($ERROR_MESSAGE{cant_open}, $CONFIG{EPG_FILENAME})); + return; + } + main::Log(LOG_VDRCOM, "LOG_VDRCOM: connect to $CONFIG{VDR_HOST}:$CONFIG{VDR_PORT}"); + + $SOCKET = + IO::Socket::INET->new(PeerAddr => $CONFIG{VDR_HOST}, + PeerPort => $CONFIG{VDR_PORT}, + Proto => 'tcp' + ) + || main::HTMLError(sprintf($ERROR_MESSAGE{connect_failed}, $CONFIG{VDR_HOST}, $CONFIG{VDR_PORT})) && return; + + my $line; + $line = <$SOCKET>; + if (!$VDRVERSION) { + $line =~ /^220.*VideoDiskRecorder (.*)\.(.*)\.(.*);/; + $VDRVERSION_HR = "$1.$2.$3"; + $VDRVERSION = ($1 * 10000 + $2 * 100 + $3); + } + $connected = true; } sub close { - my $this = shift; - if( $epg && $CONFIG{EPG_DIRECT} ) { - main::Log(LOG_VDRCOM, "LOG_VDRCOM: closing EPG"); - close $EPGSOCKET; - $epg=false; - return; - } - if($connected) { - main::Log(LOG_VDRCOM, "LOG_VDRCOM: closing connection"); - command($this, "quit"); - readoneline($this); - close $SOCKET if $SOCKET; - $connected = false; - } + my $this = shift; + if ($epg && $CONFIG{EPG_DIRECT}) { + main::Log(LOG_VDRCOM, "LOG_VDRCOM: closing EPG"); + close $EPGSOCKET; + $epg = false; + return; + } + if ($connected) { + main::Log(LOG_VDRCOM, "LOG_VDRCOM: closing connection"); + command($this, "quit"); + readoneline($this); + close $SOCKET if $SOCKET; + $connected = false; + } } sub command { - my $this = shift; - my $cmd = join("", @_); - - if ( $cmd =~ /^lste/ && $CONFIG{EPG_DIRECT} ) { - $epg=true; - main::Log(LOG_VDRCOM, sprintf("LOG_VDRCOM: special epg ")); - } else { - $epg=false; - } - if(!$connected || $epg) { - myconnect($this); - } - if ( $epg ) { - $query = true; - return; - } - - main::Log(LOG_VDRCOM, sprintf("LOG_VDRCOM: send \"%s\"", $cmd)); - $cmd = $cmd . CRLF; - if($SOCKET && $SOCKET->connected()) { - my $result = send($SOCKET, $cmd, 0); - if($result != length($cmd)) { #TODO: ??? - main::HTMLError(sprintf($ERROR_MESSAGE{send_command}, $CONFIG{VDR_HOST})); - } else { - $query = true; - } - } + my $this = shift; + my $cmd = join("", @_); + + if ($cmd =~ /^lste/ && $CONFIG{EPG_DIRECT}) { + $epg = true; + main::Log(LOG_VDRCOM, sprintf("LOG_VDRCOM: special epg ")); + } else { + $epg = false; + } + if (!$connected || $epg) { + myconnect($this); + } + if ($epg) { + $query = true; + return; + } + + main::Log(LOG_VDRCOM, sprintf("LOG_VDRCOM: send \"%s\"", $cmd)); + $cmd = $cmd . CRLF; + if ($SOCKET && $SOCKET->connected()) { + my $result = send($SOCKET, $cmd, 0); + if ($result != length($cmd)) { #TODO: ??? + main::HTMLError(sprintf($ERROR_MESSAGE{send_command}, $CONFIG{VDR_HOST})); + } else { + $query = true; + } + } } sub readoneline { - my $this = shift; - my $line; - - if ( $epg && $CONFIG{EPG_DIRECT} ) { - $line = <$EPGSOCKET>; - $line =~ s/\n$//; - main::Log(LOG_VDRCOM, sprintf("LOG_VDRCOM: EPGread \"%s\"", $line)); - $query=true; - return($line); - } - - if($SOCKET && $SOCKET->connected() && $query) { - $line = <$SOCKET>; - $line =~ s/\r\n$//; - if(substr($line, 3, 1) ne "-") { - $query = 0; - } - $line = substr($line, 4, length($line)); - main::Log(LOG_VDRCOM, sprintf("LOG_VDRCOM: read \"%s\"", $line)); - return($line); - } else { - return undef; - } + my $this = shift; + my $line; + + if ($epg && $CONFIG{EPG_DIRECT}) { + $line = <$EPGSOCKET>; + $line =~ s/\n$//; + main::Log(LOG_VDRCOM, sprintf("LOG_VDRCOM: EPGread \"%s\"", $line)); + $query = true; + return ($line); + } + + if ($SOCKET && $SOCKET->connected() && $query) { + $line = <$SOCKET>; + $line =~ s/\r\n$//; + if (substr($line, 3, 1) ne "-") { + $query = 0; + } + $line = substr($line, 4, length($line)); + main::Log(LOG_VDRCOM, sprintf("LOG_VDRCOM: read \"%s\"", $line)); + return ($line); + } else { + return undef; + } } + # ############################################################################# |