diff options
| author | Andreas Brachold <vdr07@deltab.de> | 2008-03-29 17:21:28 +0000 |
|---|---|---|
| committer | Andreas Brachold <vdr07@deltab.de> | 2008-03-29 17:21:28 +0000 |
| commit | 65fe8ca180f78115a4797d2f7a34a5a6651433b2 (patch) | |
| tree | 7f30f319347a6be92e088bc67cf61d7121a80247 | |
| parent | 4fbe6641cac6348ae487d68c06019c85c56b72d9 (diff) | |
| download | xxv-65fe8ca180f78115a4797d2f7a34a5a6651433b2.tar.gz xxv-65fe8ca180f78115a4797d2f7a34a5a6651433b2.tar.bz2 | |
* Skins: Rename flag to diagnose from debug to verbose
* Remove unused Data::Dumper
* Hide 'select language' if run with --utf8, avoid losing encoding by reconfigure
* UTF8: Add mysql_enable_utf8
50 files changed, 53 insertions, 54 deletions
diff --git a/skins/deltab/alist.tmpl b/skins/deltab/alist.tmpl index 98b7eb9..ae00a97 100644 --- a/skins/deltab/alist.tmpl +++ b/skins/deltab/alist.tmpl @@ -7,7 +7,7 @@ <?% BLOCK RowButtons %?> <?% IF allow('tlist') %?> <?% IF param.timers.${id}.allTimer.size %?> -<?% IF debug %?> +<?% IF verbose %?> <!-- active: <?% param.timers.${id}.activeTimer.size %?> --> <!-- deactive:<?% param.timers.${id}.deactiveTimer.size %?> --> <?% END %?> @@ -94,7 +94,7 @@ <?% fields = data.shift %?> <table summary="" width="100%"> <?% FOREACH zeile = data %?> - <?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> + <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> <tr<?% " class='two'" IF loop.count mod 2 == 0 %?>> <?% id=zeile.0;act=zeile.1;title=zeile.2;channels=zeile.3;directory=zeile.4;start=zeile.5;stop=zeile.6;minlength=zeile.7 %?> <?% IF act == 'y' %?><?% aktiv = 1 %?><?% ELSE %?><?% aktiv = 0 %?><?% END %?> diff --git a/skins/deltab/clist.tmpl b/skins/deltab/clist.tmpl index 4e7b18f..9001a4e 100644 --- a/skins/deltab/clist.tmpl +++ b/skins/deltab/clist.tmpl @@ -105,7 +105,7 @@ </h1> <form name="clist" action=""> <?% FOREACH zeile = data %?> - <?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> + <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> <?%- id=zeile.0;name=zeile.1;frequency=zeile.2;parameters=zeile.3; source=zeile.4;srate=zeile.5;VPID=zeile.6;APID=zeile.7;TPID=zeile.8; CA=zeile.9;SID=zeile.10;NID=zeile.11;TID=zeile.12;RID=zeile.13;GRP=zeile.14; diff --git a/skins/deltab/display.tmpl b/skins/deltab/display.tmpl index 954769e..b19b820 100644 --- a/skins/deltab/display.tmpl +++ b/skins/deltab/display.tmpl @@ -1,5 +1,5 @@ <!-- display --> -<?% IF debug %?> +<?% IF verbose %?> <!-- First: <?% FOREACH x = data.first %?><?% loop.count - 1 %?>:<?% x %?>|<?% END %?> --> <!-- Last: <?% FOREACH x = data.last %?><?% loop.count - 1 %?>:<?% x %?>|<?% END %?> --> <?% END %?> diff --git a/skins/deltab/help.tmpl b/skins/deltab/help.tmpl index a3d127a..da65a3b 100644 --- a/skins/deltab/help.tmpl +++ b/skins/deltab/help.tmpl @@ -17,7 +17,7 @@ <?% IF data.size > 1 %?> <table summary="" width="100%"> <?% FOREACH zeile = data %?> - <?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> + <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> <tr<?% " class='two'" IF loop.count mod 2 == 0 %?>> <?% short=zeile.0;long=zeile.1;modul=zeile.2;desc=zeile.3 %?> <?% IF allow(long) %?> diff --git a/skins/deltab/mlist.tmpl b/skins/deltab/mlist.tmpl index c2a7686..857a49c 100644 --- a/skins/deltab/mlist.tmpl +++ b/skins/deltab/mlist.tmpl @@ -109,7 +109,7 @@ <th width="100" align="right"></th> </tr> <?% FOREACH zeile = data %?> - <?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> + <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> <tr<?% " class='two'" IF loop.count mod 2 == 0 %?>> <?% id=zeile.0;artist=zeile.1;album=zeile.2;title=zeile.3;track=zeile.4;year=zeile.5;playtime=zeile.6;genre=zeile.7;comment=zeile.8 %?> diff --git a/skins/deltab/movetimerlist.tmpl b/skins/deltab/movetimerlist.tmpl index c181e94..c52af24 100644 --- a/skins/deltab/movetimerlist.tmpl +++ b/skins/deltab/movetimerlist.tmpl @@ -62,7 +62,7 @@ <th width="64" align="right"></th> </tr> <?% FOREACH zeile = data %?> - <?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> + <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> <?%- id=zeile.0;source=zeile.1;destination=zeile.2;when=zeile.3;action=zeile.4 -%?> <?% PROCESS Item %?> <?% END %?> diff --git a/skins/deltab/now.tmpl b/skins/deltab/now.tmpl index 14b82a5..5f3b697 100644 --- a/skins/deltab/now.tmpl +++ b/skins/deltab/now.tmpl @@ -105,7 +105,7 @@ <th width="40" align="right"></th> </tr> <?% FOREACH zeile = data %?> - <?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> + <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> <tr<?% " class='two'" IF loop.count mod 2 == 0 %?>> <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;sender=zeile.3; channel=zeile.4;group=zeile.5;start=zeile.6;stop=zeile.7; diff --git a/skins/deltab/program.tmpl b/skins/deltab/program.tmpl index d2b7f1d..eddafbe 100644 --- a/skins/deltab/program.tmpl +++ b/skins/deltab/program.tmpl @@ -76,7 +76,7 @@ </tr> <?% FOREACH zeile = data %?> - <?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> + <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;start=zeile.3;stop=zeile.4; description=zeile.6;video=zeile.7;audio=zeile.8;pdc=zeile.9; timerid=zeile.10;recording=zeile.11;running=zeile.12; diff --git a/skins/deltab/rlist.tmpl b/skins/deltab/rlist.tmpl index 06b0cf4..a9eb4ae 100644 --- a/skins/deltab/rlist.tmpl +++ b/skins/deltab/rlist.tmpl @@ -177,7 +177,7 @@ <th width="60" align="right"></th> </tr> <?% FOREACH zeile = data %?> - <?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> + <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> <tr<?% " class='two'" IF loop.count mod 2 == 0 %?>> <?%- id=zeile.0; eventid=zeile.1; diff --git a/skins/deltab/search.tmpl b/skins/deltab/search.tmpl index 36229cd..15442e9 100644 --- a/skins/deltab/search.tmpl +++ b/skins/deltab/search.tmpl @@ -74,7 +74,7 @@ <th width="40" align="right"></th> </tr> <?% FOREACH zeile = data %?> - <?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> + <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;sender=zeile.3; channel=zeile.4;start=zeile.5;stop=zeile.6;description=zeile.8; pdc=zeile.9;timerid=zeile.10;recording=zeile.11;running=zeile.12; diff --git a/skins/deltab/tlist.tmpl b/skins/deltab/tlist.tmpl index 345de96..5c61761 100644 --- a/skins/deltab/tlist.tmpl +++ b/skins/deltab/tlist.tmpl @@ -141,7 +141,7 @@ <th width="64" align="right"></th> </tr> <?% FOREACH zeile = data %?> - <?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> + <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> <?%- id=zeile.0; aktiv= ( zeile.1 ? zeile.1 mod 2 : 0 ); sender=zeile.2; diff --git a/skins/deltab/topten.tmpl b/skins/deltab/topten.tmpl index 7dbaf24..5bb4a6c 100644 --- a/skins/deltab/topten.tmpl +++ b/skins/deltab/topten.tmpl @@ -72,7 +72,7 @@ <table summary="" width="100%"> <tr height="0"><th width="120"></th><th></th><th width="100"></th><th width="40" align="right"></th></tr> <?% FOREACH zeile = data %?> - <?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> + <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;sender=zeile.3; channel=zeile.4;start=zeile.5;stop=zeile.6;day=zeile.7;description=zeile.8; pdc=zeile.9;timerid=zeile.10;recording=zeile.11;running=zeile.12; diff --git a/skins/deltab/ulist.tmpl b/skins/deltab/ulist.tmpl index 1f4e489..2abe308 100644 --- a/skins/deltab/ulist.tmpl +++ b/skins/deltab/ulist.tmpl @@ -24,7 +24,7 @@ <?% fields = data.shift %?> <table summary="" width="100%"> <?% FOREACH zeile = data %?> - <?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> + <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> <tr<?% " class='two'" IF loop.count mod 2 == 0 %?>> <?% id=zeile.0;user=zeile.1;right=zeile.2 %?> <?% IF zeile.size <= 1 %?> diff --git a/skins/stone/alist.tmpl b/skins/stone/alist.tmpl index 31b1fb1..3a637f0 100644 --- a/skins/stone/alist.tmpl +++ b/skins/stone/alist.tmpl @@ -8,7 +8,7 @@ <?% BLOCK RowButtons %?> <?% IF allow('tlist') %?> <?% IF param.timers.${id}.allTimer.size %?> -<?% IF debug %?> +<?% IF verbose %?> <!-- active: <?% param.timers.${id}.activeTimer.size %?> --> <!-- deactive:<?% param.timers.${id}.deactiveTimer.size %?> --> <?% END %?> @@ -113,7 +113,7 @@ <?% IF data.size > 1 %?> <?% fields = data.shift %?> <?% FOREACH zeile = data %?> - <?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> + <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> <?% id=zeile.0;title=zeile.2;channels=zeile.3;directory=zeile.4;start=zeile.5;stop=zeile.6;minlength=zeile.7 %?> <?% IF zeile.1 == 'y' %?><?% aktiv = 1 %?><?% ELSE %?><?% aktiv = 0 %?><?% END %?> <?% PROCESS ItemAsArea %?> diff --git a/skins/stone/clist.tmpl b/skins/stone/clist.tmpl index bf36164..6bfbdde 100644 --- a/skins/stone/clist.tmpl +++ b/skins/stone/clist.tmpl @@ -87,7 +87,7 @@ <?% fields = data.shift %?> <form name="clist" action=""> <?% FOREACH zeile = data %?> - <?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> + <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> <?%- id=zeile.0;name=zeile.1;frequency=zeile.2;parameters=zeile.3; source=zeile.4;srate=zeile.5;VPID=zeile.6;APID=zeile.7;TPID=zeile.8; CA=zeile.9;SID=zeile.10;NID=zeile.11;TID=zeile.12;RID=zeile.13;GRP=zeile.14; diff --git a/skins/stone/display.tmpl b/skins/stone/display.tmpl index 594ab2c..c447cde 100644 --- a/skins/stone/display.tmpl +++ b/skins/stone/display.tmpl @@ -3,7 +3,7 @@ <body class="hilfsframed"> <div> <?% END %?> -<?% IF debug %?> +<?% IF verbose %?> <!-- First: <?% FOREACH x = data.first %?><?% loop.count - 1 %?>:<?% x %?>|<?% END %?> --> <!-- Last: <?% FOREACH x = data.last %?><?% loop.count - 1 %?>:<?% x %?>|<?% END %?> --> <?% END %?> diff --git a/skins/stone/help.tmpl b/skins/stone/help.tmpl index 8a5c809..b3f4209 100644 --- a/skins/stone/help.tmpl +++ b/skins/stone/help.tmpl @@ -46,7 +46,7 @@ <p><?% data.shift %?></p> <?% IF data.size > 1 %?> <?% FOREACH zeile = data %?> - <?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> + <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> <?% short=zeile.0;long=zeile.1;modul=zeile.2;desc=zeile.3 %?> <?% IF allow(long) %?> <?% IF !old.defined || modul != old %?> diff --git a/skins/stone/mldisplay.tmpl b/skins/stone/mldisplay.tmpl index 3a95a6b..c74c562 100644 --- a/skins/stone/mldisplay.tmpl +++ b/skins/stone/mldisplay.tmpl @@ -124,7 +124,7 @@ seen = f.25; <?% IF param.actors.0.0 %?> <h2><?% gettext("Actors") %?></h2> <?% FOREACH zeile = param.actors %?> - <?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> + <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> <?% actor = zeile.0;imgurl=zeile.1 %?> <div class="areabegin"> <table class="fieldtable" summary=""> diff --git a/skins/stone/mlist.tmpl b/skins/stone/mlist.tmpl index a2fa6c3..3e5d945 100644 --- a/skins/stone/mlist.tmpl +++ b/skins/stone/mlist.tmpl @@ -149,7 +149,7 @@ <?% fields = data.shift %?> <form name="mlist" action=""> <?% FOREACH zeile = data %?> - <?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> + <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> <?% id=zeile.0;artist=zeile.1;album=zeile.2;title=zeile.3;track=zeile.4;year=zeile.5;playtime=zeile.6;genre=zeile.7;comment=zeile.8 %?> <?% IF !old.defined || album != old %?> <?% IF old.defined %?> diff --git a/skins/stone/mllist.tmpl b/skins/stone/mllist.tmpl index 809914f..f852421 100644 --- a/skins/stone/mllist.tmpl +++ b/skins/stone/mllist.tmpl @@ -91,7 +91,7 @@ <h1><?% gettext("Media library") %?></h1> <form name="mlist" action=""> <?% FOREACH zeile = data %?> - <?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> + <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> <?% id=zeile.0;imgurl=zeile.1;title=zeile.2;subtitle=zeile.3;year=zeile.4;director=zeile.5;description=zeile.6; %?> <?% PROCESS ItemAsArea %?> <?% END %?> diff --git a/skins/stone/mlresearch.tmpl b/skins/stone/mlresearch.tmpl index 4e503bf..eda70ea 100644 --- a/skins/stone/mlresearch.tmpl +++ b/skins/stone/mlresearch.tmpl @@ -14,7 +14,7 @@ <?% FOREACH zeile = data %?> - <?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> + <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> <?% importurl = zeile.0;imgurl=zeile.1;title=zeile.2;description=zeile.3 %?> <div class="areabegin"> <table class="fieldtable" summary=""> diff --git a/skins/stone/movetimerlist.tmpl b/skins/stone/movetimerlist.tmpl index 5c1f169..a901422 100644 --- a/skins/stone/movetimerlist.tmpl +++ b/skins/stone/movetimerlist.tmpl @@ -71,7 +71,7 @@ <th width="64" align="right"></th> </tr> <?% FOREACH zeile = data %?> - <?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> + <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> <?%- id=zeile.0;source=zeile.1;destination=zeile.2;when=zeile.3;action=zeile.4 -%?> <?% PROCESS Item %?> <?% END %?> diff --git a/skins/stone/now.tmpl b/skins/stone/now.tmpl index 9b790d8..81c758e 100644 --- a/skins/stone/now.tmpl +++ b/skins/stone/now.tmpl @@ -133,7 +133,7 @@ <?% IF data.size > 1%?> <?% fields = data.shift %?> <?% FOREACH zeile = data %?> - <?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> + <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;sender=zeile.3; channel=zeile.4;group=zeile.5;start=zeile.6;stop=zeile.7; description=zeile.8;duration=zeile.9; diff --git a/skins/stone/program.tmpl b/skins/stone/program.tmpl index df9db09..7afd584 100644 --- a/skins/stone/program.tmpl +++ b/skins/stone/program.tmpl @@ -117,7 +117,7 @@ <?% fields = data.shift %?> <h1><?% gettext("Program guide for") %?> <?% channel %?> - <?% data.first.5 %?></h1> <?% FOREACH zeile = data %?> - <?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> + <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;start=zeile.3;stop=zeile.4; description=zeile.6;video=zeile.7;audio=zeile.8;pdc=zeile.9; timerid=zeile.10;recording=zeile.11;running=zeile.12; diff --git a/skins/stone/rlist.tmpl b/skins/stone/rlist.tmpl index 192625a..d8fbd34 100644 --- a/skins/stone/rlist.tmpl +++ b/skins/stone/rlist.tmpl @@ -199,7 +199,7 @@ <?% fields = data.shift %?> <form name="rlist" action=""> <?%- FOREACH zeile = data; - IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END; + IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END; id=zeile.0; eventid=zeile.1; title=zeile.2.split('~').last; diff --git a/skins/stone/search.tmpl b/skins/stone/search.tmpl index 3387d44..1db2c08 100644 --- a/skins/stone/search.tmpl +++ b/skins/stone/search.tmpl @@ -105,7 +105,7 @@ <h1><?% gettext("Search text") %?> : <?% cgi.param('data') %?> - <?% data.first.7 %?></h1> <form name="searchlist" action=""> <?% FOREACH zeile = data %?> - <?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> + <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;sender=zeile.3; channel=zeile.4;start=zeile.5;stop=zeile.6;day=zeile.7;description=zeile.8; pdc=zeile.9;timerid=zeile.10;recording=zeile.11;running=zeile.12 %?> diff --git a/skins/stone/tlist.tmpl b/skins/stone/tlist.tmpl index c36efe5..7fce7a8 100644 --- a/skins/stone/tlist.tmpl +++ b/skins/stone/tlist.tmpl @@ -160,7 +160,7 @@ <h1><?% gettext("Planned recordings") %?> - <?% data.first.4 %?></h1> <form name="tlist" action=""> <?% FOREACH zeile = data %?> - <?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> + <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> <?%- id=zeile.0; aktiv= ( zeile.1 ? zeile.1 mod 2 : 0 ); sender=zeile.2; diff --git a/skins/stone/topten.tmpl b/skins/stone/topten.tmpl index 0377522..5775843 100644 --- a/skins/stone/topten.tmpl +++ b/skins/stone/topten.tmpl @@ -96,7 +96,7 @@ <?% fields = data.shift %?> <h1><?% gettext("Top Ten entrys") %?></h1> <?% FOREACH zeile = data %?> - <?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> + <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;sender=zeile.3; channel=zeile.4;start=zeile.5;stop=zeile.6;day = zeile.7;description=zeile.8; pdc=zeile.9;timerid=zeile.10;recording=zeile.11;running=zeile.12; diff --git a/skins/stone/ulist.tmpl b/skins/stone/ulist.tmpl index 55a6ab0..2653879 100644 --- a/skins/stone/ulist.tmpl +++ b/skins/stone/ulist.tmpl @@ -58,7 +58,7 @@ <?% IF data.size > 1 %?> <?% fields = data.shift %?> <?% FOREACH zeile = data %?> - <?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> + <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> <?% id=zeile.0;user=zeile.1;right=zeile.2 %?> <?% IF zeile.size <= 1 %?> <div class="areaclose"></div> diff --git a/skins/stone/widgets/footer.tmpl b/skins/stone/widgets/footer.tmpl index e0e3334..619b229 100644 --- a/skins/stone/widgets/footer.tmpl +++ b/skins/stone/widgets/footer.tmpl @@ -2,7 +2,7 @@ </div> <?% END %?> <!-- ###### Ende ###### --> -<?% IF debug %?> +<?% IF verbose %?> <?% benchdata = bench() %?> <?% IF benchdata.keys %?> <table class="editortable" summary=""> diff --git a/skins/stone_flat/alist.tmpl b/skins/stone_flat/alist.tmpl index 2be87bd..d9461f9 100644 --- a/skins/stone_flat/alist.tmpl +++ b/skins/stone_flat/alist.tmpl @@ -8,7 +8,7 @@ <?% BLOCK RowButtons %?> <?% IF allow('tlist') %?> <?% IF param.timers.${id}.allTimer.size %?> -<?% IF debug %?> +<?% IF verbose %?> <!-- active: <?% param.timers.${id}.activeTimer.size %?> --> <!-- deactive:<?% param.timers.${id}.deactiveTimer.size %?> --> <?% END %?> @@ -102,7 +102,7 @@ <table width="100%"> <tr height="0"><th width="20"></th><th></th><th width="200"></th><th width="100"></th><th width="80"></th><th width="100" align="right"></th></tr> <?% FOREACH zeile = data %?> - <?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> + <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> <?% id=zeile.0;title=zeile.2;channels=zeile.3;directory=zeile.4;start=zeile.5;stop=zeile.6;minlength=zeile.7 %?> <?% IF zeile.1 == 'y' %?><?% aktiv = 1 %?><?% ELSE %?><?% aktiv = 0 %?><?% END %?> <?% PROCESS ItemAsFlat %?> diff --git a/skins/stone_flat/clist.tmpl b/skins/stone_flat/clist.tmpl index 10c05ab..b75d33f 100644 --- a/skins/stone_flat/clist.tmpl +++ b/skins/stone_flat/clist.tmpl @@ -87,7 +87,7 @@ <?% fields = data.shift %?> <form name="clist" action=""> <?% FOREACH zeile = data %?> - <?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> + <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> <?%- id=zeile.0;name=zeile.1;frequency=zeile.2;parameters=zeile.3; source=zeile.4;srate=zeile.5;VPID=zeile.6;APID=zeile.7;TPID=zeile.8; CA=zeile.9;SID=zeile.10;NID=zeile.11;TID=zeile.12;RID=zeile.13;GRP=zeile.14; diff --git a/skins/stone_flat/display.tmpl b/skins/stone_flat/display.tmpl index 305f3cf..6582880 100644 --- a/skins/stone_flat/display.tmpl +++ b/skins/stone_flat/display.tmpl @@ -3,7 +3,7 @@ <body class="hilfsframed"> <div> <?% END %?> -<?% IF debug %?> +<?% IF verbose %?> <!-- First: <?% FOREACH x = data.first %?><?% loop.count - 1 %?>:<?% x %?>|<?% END %?> --> <!-- Last: <?% FOREACH x = data.last %?><?% loop.count - 1 %?>:<?% x %?>|<?% END %?> --> <?% END %?> diff --git a/skins/stone_flat/help.tmpl b/skins/stone_flat/help.tmpl index d7ce4a1..c36cf88 100644 --- a/skins/stone_flat/help.tmpl +++ b/skins/stone_flat/help.tmpl @@ -26,7 +26,7 @@ <p><?% data.shift %?></p> <?% IF data.size > 1 %?> <?% FOREACH zeile = data %?> - <?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> + <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> <?% short=zeile.0;long=zeile.1;modul=zeile.2;desc=zeile.3 %?> <?% IF allow(long) %?> <?% IF !old.defined || modul != old %?> diff --git a/skins/stone_flat/mldisplay.tmpl b/skins/stone_flat/mldisplay.tmpl index c81e0ad..6839547 100644 --- a/skins/stone_flat/mldisplay.tmpl +++ b/skins/stone_flat/mldisplay.tmpl @@ -134,7 +134,7 @@ seen = f.25; <td class="largetext"> <?% FOREACH zeile = param.actors %?> - <?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> + <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> <?% actor = zeile.0;imgurl=zeile.1 %?> <div style="float:left;"> <div class="actor"> diff --git a/skins/stone_flat/mlist.tmpl b/skins/stone_flat/mlist.tmpl index b2cdeff..5621996 100644 --- a/skins/stone_flat/mlist.tmpl +++ b/skins/stone_flat/mlist.tmpl @@ -93,7 +93,7 @@ <?% fields = data.shift %?> <form name="mlist" action=""> <?% FOREACH zeile = data %?> - <?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> + <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> <?% id=zeile.0;artist=zeile.1;album=zeile.2;title=zeile.3;track=zeile.4;year=zeile.5;playtime=zeile.6;genre=zeile.7;comment=zeile.8 %?> <?% IF !old.defined || album != old %?> <?% IF old.defined %?> diff --git a/skins/stone_flat/mllist.tmpl b/skins/stone_flat/mllist.tmpl index a3e4752..71ec9fe 100644 --- a/skins/stone_flat/mllist.tmpl +++ b/skins/stone_flat/mllist.tmpl @@ -65,7 +65,7 @@ <table summary="" width="100%"> <tr height="0"><th width="60"></th><th></th><th width="64"></th></tr> <?% FOREACH zeile = data %?> - <?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> + <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> <?% id=zeile.0;imgurl=zeile.1;title=zeile.2;subtitle=zeile.3;year=zeile.4;director=zeile.5;description=zeile.6; %?> <?% PROCESS ItemAsFlat %?> <?% END %?> diff --git a/skins/stone_flat/mlresearch.tmpl b/skins/stone_flat/mlresearch.tmpl index 6f900f9..38ccdc7 100644 --- a/skins/stone_flat/mlresearch.tmpl +++ b/skins/stone_flat/mlresearch.tmpl @@ -19,7 +19,7 @@ <table summary="" width="100%"> <tr height="0"><th width="60"></th><th></th></tr> <?% FOREACH zeile = data %?> - <?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> + <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> <?% importurl = zeile.0;imgurl=zeile.1;title=zeile.2;description=zeile.3 %?> <tr<?% ' class="two"' IF loop.count mod 2 == 0 %?>> <td class="fieldinline"> diff --git a/skins/stone_flat/movetimerlist.tmpl b/skins/stone_flat/movetimerlist.tmpl index 7a988f3..9be331f 100644 --- a/skins/stone_flat/movetimerlist.tmpl +++ b/skins/stone_flat/movetimerlist.tmpl @@ -71,7 +71,7 @@ <th width="64" align="right"></th> </tr> <?% FOREACH zeile = data %?> - <?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> + <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> <?%- id=zeile.0;source=zeile.1;destination=zeile.2;when=zeile.3;action=zeile.4 -%?> <?% PROCESS Item %?> <?% END %?> diff --git a/skins/stone_flat/now.tmpl b/skins/stone_flat/now.tmpl index bac3a47..0f3e4a6 100644 --- a/skins/stone_flat/now.tmpl +++ b/skins/stone_flat/now.tmpl @@ -128,7 +128,7 @@ <table summary="" width="100%"> <tr><th width="150"></th><th></th><th width="140"></th><th width="110"></th><th width="40"></th></tr> <?% FOREACH zeile = data %?> - <?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> + <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;sender=zeile.3; channel=zeile.4;group=zeile.5;start=zeile.6;stop=zeile.7; description=zeile.8;duration=zeile.9; diff --git a/skins/stone_flat/program.tmpl b/skins/stone_flat/program.tmpl index b183171..5372dd2 100644 --- a/skins/stone_flat/program.tmpl +++ b/skins/stone_flat/program.tmpl @@ -92,7 +92,7 @@ <?% fields = data.shift %?> <?% z = 0 %?> <?% FOREACH zeile = data %?> - <?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> + <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;start=zeile.3;stop=zeile.4; description=zeile.6;video=zeile.7;audio=zeile.8;pdc=zeile.9; timerid=zeile.10;recording=zeile.11;running=zeile.12; diff --git a/skins/stone_flat/rlist.tmpl b/skins/stone_flat/rlist.tmpl index 66ec23a..9fe2332 100644 --- a/skins/stone_flat/rlist.tmpl +++ b/skins/stone_flat/rlist.tmpl @@ -163,7 +163,7 @@ <table summary="" width="100%"> <tr height="0"><th width="<?% IF param.previewcommand != 'n' %?>200<?% ELSE %?>20<?% END %?>"></th><th></th><th width="64"></th></tr> <?%- FOREACH zeile = data; - IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END; + IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END; id=zeile.0; eventid=zeile.1; title=zeile.2.split('~').last; diff --git a/skins/stone_flat/search.tmpl b/skins/stone_flat/search.tmpl index 41481fb..e62160c 100644 --- a/skins/stone_flat/search.tmpl +++ b/skins/stone_flat/search.tmpl @@ -77,7 +77,7 @@ <?% fields = data.shift %?> <form name="searchlist" action=""> <?% FOREACH zeile = data %?> - <?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> + <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;sender=zeile.3; channel=zeile.4;start=zeile.5;stop=zeile.6;description=zeile.8; pdc=zeile.9;timerid=zeile.10;recording=zeile.11;running=zeile.12; diff --git a/skins/stone_flat/tlist.tmpl b/skins/stone_flat/tlist.tmpl index c85291b..ecdc31a 100644 --- a/skins/stone_flat/tlist.tmpl +++ b/skins/stone_flat/tlist.tmpl @@ -142,7 +142,7 @@ <form name="tlist" action=""> <?% z = 1 %?> <?% FOREACH zeile = data %?> - <?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> + <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> <?%- id=zeile.0; aktiv= ( zeile.1 ? zeile.1 mod 2 : 0 ); sender=zeile.2; diff --git a/skins/stone_flat/topten.tmpl b/skins/stone_flat/topten.tmpl index 9578ea6..c42a405 100644 --- a/skins/stone_flat/topten.tmpl +++ b/skins/stone_flat/topten.tmpl @@ -79,7 +79,7 @@ <?% fields = data.shift %?> <h1><?% gettext("Top Ten entrys") %?></h1> <?% FOREACH zeile = data %?> - <?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> + <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;sender=zeile.3; channel=zeile.4;start=zeile.5;stop=zeile.6;day=zeile.7;description=zeile.8; pdc=zeile.9;timerid=zeile.10;recording=zeile.11;running=zeile.12; diff --git a/skins/stone_flat/ulist.tmpl b/skins/stone_flat/ulist.tmpl index 4d82cc0..de6d0f4 100644 --- a/skins/stone_flat/ulist.tmpl +++ b/skins/stone_flat/ulist.tmpl @@ -45,7 +45,7 @@ <table summary="" width="100%"> <tr height="0"><th></th><th></th><th width="60" align="right"></th></tr> <?% FOREACH zeile = data %?> - <?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> + <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> <?% id=zeile.0;user=zeile.1;right=zeile.2 %?> <?% PROCESS ItemAsFlat %?> <?% END %?> diff --git a/skins/xstyle/help.tmpl b/skins/xstyle/help.tmpl index 47db7de..5b3331a 100644 --- a/skins/xstyle/help.tmpl +++ b/skins/xstyle/help.tmpl @@ -16,7 +16,7 @@ <?% IF data.size > 1 %?> <table summary="" width="100%"> <?% FOREACH zeile = data %?> - <?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> + <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> <tr<?% " class='two'" IF loop.count mod 2 == 0 %?>> <?% short=zeile.0;long=zeile.1;modul=zeile.2;desc=zeile.3 %?> <?% IF allow(long) %?> diff --git a/skins/xstyle/movetimerlist.tmpl b/skins/xstyle/movetimerlist.tmpl index 63f361f..afa9e72 100644 --- a/skins/xstyle/movetimerlist.tmpl +++ b/skins/xstyle/movetimerlist.tmpl @@ -87,7 +87,7 @@ <th><?% gettext('Change original timer') %?></th> </tr> <?% FOREACH zeile = data %?> - <?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> + <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?> <?%- id=zeile.0;source=zeile.1;destination=zeile.2;when=zeile.3;action=zeile.4 -%?> <?% PROCESS Item %?> <?% END %?> diff --git a/skins/xstyle/rlist.tmpl b/skins/xstyle/rlist.tmpl index f9e1e77..a3a1859 100644 --- a/skins/xstyle/rlist.tmpl +++ b/skins/xstyle/rlist.tmpl @@ -61,7 +61,7 @@ </div> <div style="height:3em; overflow:hidden;"> <a href="?cmd=rlist&data=<?% url( fulltitle ) %?>"> - <b><?% foldertitle | html %?></b><br /> + <b><?% foldertitle %?></b><br /> <img src="images/<?% new ? "newfolder" : "foldericon" %?>.png" alt="" title="<?% new ? gettext("New recording") : "" %?>" /> <?% folder %?><?% IF new %?> (<?% new %?>)<?% END %?> <?% gettext("more recordings") %?> ... diff --git a/skins/xstyle/widgets/footer.tmpl b/skins/xstyle/widgets/footer.tmpl index 100beb2..61e4372 100644 --- a/skins/xstyle/widgets/footer.tmpl +++ b/skins/xstyle/widgets/footer.tmpl @@ -1,6 +1,5 @@ </div> -<?% debug = 0 %?> -<?% IF debug %?> +<?% IF verbose %?> <?% data = bench %?> <div class="tab-pane" id="tabPane1"> |