Menu
▾
▴
easybox-mod-developers — list of easybox developers
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(5) |
Oct
(26) |
Nov
(10) |
Dec
(7) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(7) |
Feb
(17) |
Mar
(25) |
Apr
(8) |
May
(33) |
Jun
(11) |
Jul
(1) |
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(2) |
Aug
(68) |
Sep
(2) |
Oct
|
Nov
|
Dec
|
|
From: <ara...@us...> - 2007-05-20 10:21:53
|
Revision: 153
http://svn.sourceforge.net/easybox-mod/?rev=153&view=rev
Author: aragornis
Date: 2007-05-20 03:21:51 -0700 (Sun, 20 May 2007)
Log Message:
-----------
- nouveau module stage6
- grosses modifs sur le module mp3 (beaucoup moins de rechargements de page)
- Mise au niveau du module "modules" avec gestion multipage
- Compteur de download dans Easybox pour les modules - avant seuls les modules t?\195?\169l?\195?\169charg?\195?\169s depuis le site ?\195?\169taient comptabilis?\195?\169s
- R?\195?\169solution du probl?\195?\168me de pause ?
- Correction d'un bug sur la r?\195?\169cup?\195?\169ration des acteurs par la biblioth?\195?\168que allocin?\195?\169
- Probl?\195?\168me temps clips dailymotion r?\195?\169gl?\195?\169
- Bouton "ajouter tout le dossier"
- Am?\195?\169lioration de ces icones
- Pas de changement de page quand on ajoute des fichiers audios ?\195?\160 la playlist
- Remodelage complet de la fa?\195?\167on de g?\195?\169rer la playlist audio, plus d'aller retour sur plein de pages : on reste ?\195?\160 sa page, que ce soit dans l'explorateur ou dans la biblioth?\195?\168que
- Possibilit?\195?\169 d'ajouter/jouer toute la biblioth?\195?\168que ou tout un dossier
- Possiblit?\195?\169 de supprimer tous les signets d'un film d'un seul coup
- Plus de plantage du module clip ?\195?\160 la fin d'un clip (?)
- Possibilit?\195?\169 d'annuler la demande d'arret d'un film
- Samplerate pass?\195?\169 ?\195?\160 44100 partout (signalez moi des probl?\195?\168mes de son sur le forum s'il y en a !)
- Possibilit?\195?\169 d'exclure un film du "scan auto" r?\195?\169par?\195?\169e
- R?\195?\169paration de la r?\195?\169cup?\195?\169ration du nom du r?\195?\169alisateur sans la biblioth?\195?\168que allocin?\195?\169
- Supprime la demande de r?\195?\169paration des index avi par vlc pour les fichiers stream?\195?\169s depuis internet
- Possiblit?\195?\169 de quitter le module vid?\195?\169o ?\195?\160 la fin m?\195?\170me pour un stream dont on ne connait pas la longueur par vlc : on transmet ?\195?\160 Easybox une valeur th?\195?\169orique qui sera utilis?\195?\169e (module stage6)
Modified Paths:
--------------
trunk/.htaccess
trunk/_framework/fonctions_partagees.inc.php
trunk/_framework/framework.php
trunk/_framework/lib/get_info.php
trunk/_utilisateur/modules.db
trunk/_utilisateur/rss.db
trunk/configuration/configmodif.php
trunk/http-vlc/lecteur/play-low.html
trunk/http-vlc/lecteur/play-wifi.html
trunk/http-vlc/lecteur/play.html
trunk/http-vlc/lecteur/set_option.html
trunk/module/_explorateur/explorateur.tpl
trunk/module/_explorateur/index1.php
trunk/module/clips/play_clip.php
trunk/module/dailymotion/index1.php
trunk/module/films/fichefilm.php
trunk/module/films/films.tpl
trunk/module/films/lecture.php
trunk/module/films/signet_ask.tpl
trunk/module/meteo/f2-france-512x384-j0pm.jpg
trunk/module/meteo/f2-france-512x384-j1am.jpg
trunk/module/meteo/f2-france-512x384-j1pm.jpg
trunk/module/meteo/f2-france-512x384-j2am.jpg
trunk/module/meteo/f2-france-512x384-j2pm.jpg
trunk/module/meteo/f2-france-512x384-j3am.jpg
trunk/module/meteo/f2-france-512x384-j3pm.jpg
trunk/module/meteo/fr.gif
trunk/module/modules/modules.tpl
trunk/module/mp3/catalogue.php
trunk/module/mp3/catalogue_audio.tpl
trunk/module/mp3/index1.php
trunk/module/mp3/lecteuraudio.php
trunk/module/mp3/paroles.php
trunk/module/mp3/playdb.php
trunk/module/mp3/playlist_audio.tpl
trunk/module/signet/signet.tpl
trunk/module/signet/supsignet.php
trunk/module/youtube/play_youtube.php
trunk/skin/mediacenter/interface/ajouter.gif
trunk/skin/mediacenter/interface/jouer.gif
trunk/skin/mediacenter/interface.tpl
trunk/skin/simple/interface/ajouter.gif
trunk/skin/simple/interface/jouer.gif
trunk/skin/simplegreen/interface/ajouter.gif
trunk/skin/simplegreen/interface/jouer.gif
trunk/version.html
Added Paths:
-----------
trunk/module/stage6/
trunk/module/stage6/icone.gif
trunk/module/stage6/index1.php
trunk/module/stage6/play_stage6.php
trunk/module/stage6/stage6.tpl
trunk/ressources/icones/Stage6.gif
trunk/skin/mediacenter/audio.tpl
Modified: trunk/.htaccess
===================================================================
--- trunk/.htaccess 2007-05-18 12:36:05 UTC (rev 152)
+++ trunk/.htaccess 2007-05-20 10:21:51 UTC (rev 153)
@@ -1 +1,2 @@
php_flag short_open_tag on
+AddType video/mp2v-es .mp2v
Modified: trunk/_framework/fonctions_partagees.inc.php
===================================================================
--- trunk/_framework/fonctions_partagees.inc.php 2007-05-18 12:36:05 UTC (rev 152)
+++ trunk/_framework/fonctions_partagees.inc.php 2007-05-20 10:21:51 UTC (rev 153)
@@ -1,7 +1,7 @@
<?php
//Fonction permettant de lire un fichier
-function play_fichier($page,$basename, $realpath=1, $type='video', $name=''){
+function play_fichier($page,$basename, $realpath=1, $type='video', $name='', $duree=0){
global $ini,$USER;
if ($name==''){
$name=$basename;
@@ -12,6 +12,7 @@
fclose(fopen('http://127.0.0.1:8081/lecteur/'.$ini['multimedia']['qualite'].'?'.$page.'&mrl='.urlencode(addslashes($basename)), "r"));
}
save_variable('current_file',$name);
+save_variable('current_duree',$duree);
save_variable('current_type',$type);
}
@@ -793,4 +794,42 @@
function add_download($name){
echo @file_get_contents('http://www.easybox-mod.org/add_dl.php?name='.$name);
}
+
+function recharger_vlc(){
+global $smarty, $VLC, $contenu_html;
+//-- Test de l'activation de VLC
+ if(!$contenu_html = @file_get_contents("http://127.0.0.1:8081/_framework/vlc/temps2.html")){
+ echo'<center><br> <br> <br>Vlc n\'est pas lanc\xE9 ou il n\'\xE9coute pas le port 8081</center>';
+ }
+
+ //Extraction des donn\xE9es de vlc
+ $signetsav=explode("|",$contenu_html);
+ $temp1=explode(":",$signetsav[1]);
+ $temp2=explode(":",$signetsav[3]);
+
+ // Fichier lanc\xE9 selon la bdd
+ $VLC['db_current']=get_variable('current_file');
+ $VLC['type_current']=$VLC['db_current_type']=get_variable('current_type');
+ $VLC['duree_current']=$VLC['db_current_duree']=get_variable('current_duree');
+
+ // Variables d'environnement de VLC
+ $VLC['etat']=$signetsav[4]; // Playing,stop,pause
+ $VLC['url_current']=$signetsav[2]; // URL du fichier en cours de lecture
+ $VLC['name_current']=stripslashes($signetsav[5]); // Nom du fichier en cours de lecture
+ $VLC['duree_courante']=$temp1[0]*3600+60*$temp1[1]+$temp1[2]; // Temps \xE9coul\xE9 en secondes depuis le d\xE9but
+ $VLC['duree_totale']=$temp2[0]*3600+60*$temp2[1]+$temp2[2]; // Temps total en secondes
+ if($VLC['duree_current']>0 AND intval($VLC['duree_totale'])==0){
+ $VLC['duree_totale']=$VLC['duree_current']; // Remplacement de la dur\xE9e totale par un, th\xE9orique
+ }
+ $VLC['duree_restante']=$VLC['duree_totale']-$VLC['duree_courante']; // Temps restant en secondes
+
+
+
+
+ $VLC['pourcentage_courant']=round($VLC['duree_courante']/($VLC['duree_totale']+1)*100); // Pourcentage deja ecoule
+
+ // Mise \xE0 disposition des infos sur le fichier en cours aux templates
+ $smarty->assign('VLC',$VLC);
+
+}
?>
Modified: trunk/_framework/framework.php
===================================================================
--- trunk/_framework/framework.php 2007-05-18 12:36:05 UTC (rev 152)
+++ trunk/_framework/framework.php 2007-05-20 10:21:51 UTC (rev 153)
@@ -1,8 +1,9 @@
<?php
//-- Test de l'activation de VLC
- if(!$contenu_html = @file_get_contents("http://127.0.0.1:8081/_framework/vlc/temps2.html")){
+/* if(!$contenu_html = @file_get_contents("http://127.0.0.1:8081/_framework/vlc/temps2.html")){
echo'<center><br> <br> <br>Vlc n\'est pas lanc\xE9 ou il n\'\xE9coute pas le port 8081</center>';
}
+*/
setlocale(LC_TIME, "fr");
@@ -112,13 +113,18 @@
$smarty->assign('OS',PHP_OS);
$smarty->register_modifier('cleanaff','supprime_accents');
+// Permet d'afficher une vid\xE9o mp2v en fond d'\xE9cran
+ $smarty->assign_by_ref('BODY_BACK',$BODY_BACK);
+
require_once($FRAMEWORK_REP."cartouche.php");
+recharger_vlc();
+/*
//Extraction des donn\xE9es de vlc
$signetsav=explode("|",$contenu_html);
$temp1=explode(":",$signetsav[1]);
$temp2=explode(":",$signetsav[3]);
-
+
// Variables d'environnement de VLC
$VLC['etat']=$signetsav[4]; // Playing,stop,pause
$VLC['url_current']=$signetsav[2]; // URL du fichier en cours de lecture
@@ -135,7 +141,8 @@
// Mise \xE0 disposition des infos sur le fichier en cours aux templates
$smarty->assign('VLC',$VLC);
-
+*/
+
// Level et nom de l'utilisateur
$userlevel = get_variable('level_user');
if($userlevel==''){
Modified: trunk/_framework/lib/get_info.php
===================================================================
--- trunk/_framework/lib/get_info.php 2007-05-18 12:36:05 UTC (rev 152)
+++ trunk/_framework/lib/get_info.php 2007-05-20 10:21:51 UTC (rev 153)
@@ -141,12 +141,12 @@
$res['date_sortie'] = 2;
//R\xE9cup\xE9ration du r\xE9alisateur
- $ereg = '<h4>R\xE9alis\xE9 par <a class="link1" href=(.{1,150})>(.{1,40})<\/a><\/h4><h4> ';
+ $ereg = '<h4>R\xE9alis\xE9 par <a class="link1" href=(.{1,150})>(.{1,40})<\/a><\/h4><\/div>';
preg_match("/$ereg/s", $filmrecherche, $valeur);
$res['realisateur'] = $valeur[2];
//R\xE9cup\xE9ration des acteurs
- $ereg = '<h4>Avec(.{1,1000})<\/a><\/h4><\/div><div style="padding: 2 0 2 0;"><h4>Film';
+ $ereg = '<h4>Avec(.{1,1000}) <img src="http:\/\/a69\.g\.akamai.net\/n\/69\/10688\/v1\/img5\.allocine\.fr\/acmedia\/skin\/allocinev5\/puce\/fleche_bleue';
preg_match("/$ereg/s", $filmrecherche, $valeur);
$res['acteurs'] = trim(strip_tags($valeur[1]));
Modified: trunk/_utilisateur/modules.db
===================================================================
(Binary files differ)
Modified: trunk/_utilisateur/rss.db
===================================================================
(Binary files differ)
Modified: trunk/configuration/configmodif.php
===================================================================
--- trunk/configuration/configmodif.php 2007-05-18 12:36:05 UTC (rev 152)
+++ trunk/configuration/configmodif.php 2007-05-20 10:21:51 UTC (rev 153)
@@ -71,6 +71,12 @@
<center><table widht="800" cellspacing="0" cellpadding="0"><tr><td align=center>';
$db = sqlite_open('../_utilisateur/video.db', 0666);
if($_REQUEST['id']!="" && $_REQUEST['name']!=""){
+ if($_REQUEST['auto']==1){
+ $bool3 = '0';
+ }else{
+ $bool3 = '1';
+ }
+ echo $bool3;
$sortie = mktime(0,0,0,$_REQUEST['moi'],$_REQUEST['jour'],$_REQUEST['an']);
$requete='
UPDATE film SET
@@ -87,7 +93,7 @@
production = \''.sqlite_escape_string($_REQUEST['production']).'\',
critique_visiteurs = \''.sqlite_escape_string($_REQUEST['notevis']).'\',
critique_presse = \''.sqlite_escape_string($_REQUEST['notecri']).'\',
- auto=\''.sqlite_escape_string($_REQUEST['auto']).'\' ,
+ auto=\''.$bool3.'\' ,
last_update=\''.time().'\'
WHERE ROWID = '.$_REQUEST['id'];
$result = sqlite_query($db,$requete);
@@ -116,6 +122,9 @@
}
$bool1[$entry['critique_visiteurs']] = 'selected';
$bool2[$entry['critique_presse']] = 'selected';
+ if($entry['auto']!=1){
+ $bool3 = 'checked';
+ }
echo'</select><br>
<br><u>R\xE9alisateur(s) (R\xE9alisateur1, r\xE9alisateur2, ...)</u><br>
<input type="text" style="border: thin outset;font-size: 9px;" name="realisateur" value="'.stripslashes($entry['realisateur']).'" size="'.(strlen($entry['realisateur'])+10).'"><br>
@@ -137,7 +146,7 @@
<textarea rows="5" style="border: thin outset;font-size: 12px;" cols="60" name="Synopsis">'.stripslashes($entry['Synopsis']).'</textarea><br>
<br><u>Url de l\'image</u><br>
<textarea rows="2" style="border: thin outset;font-size: 12px;" cols="60" name="img">'.stripslashes($entry['img']).'</textarea><br>
- <input type="checkbox" name="auto" value="1">Cochez cette case si vous ne voulez pas qu\'Easybox r\xE9cup\xE8re automatiquement des informations pour ce film et \xE9crase les donn\xE9es fournies
+ <input type="checkbox" name="auto" value="1" '.$bool3.'>Cochez cette case si vous ne voulez pas qu\'Easybox r\xE9cup\xE8re automatiquement des informations pour ce film et \xE9crase les donn\xE9es fournies
<br><br><center>
<a href="index1.php?page=55&get_info=1&id='.$_REQUEST['id'].'">Mettre \xE0 jour les informations depuis AlloCin\xE9 (en fonction du titre actuellement rentr\xE9)</a> - <a href="index1.php?page=55&get_info=-1&id='.$_REQUEST['id'].'">Effacer toutes les informations actuelles sur ce film</a><br>
<input type="submit" style="border: thin outset;font-size: 9px;" value="Mettre \xE0 jour les informations depuis AlloCin\xE9 avec la fiche du film ayant l\'id"> <input type="text" style="border: thin outset;font-size: 9px;" name="num_allocine" value=""><br>
Modified: trunk/http-vlc/lecteur/play-low.html
===================================================================
--- trunk/http-vlc/lecteur/play-low.html 2007-05-18 12:36:05 UTC (rev 152)
+++ trunk/http-vlc/lecteur/play-low.html 2007-05-20 10:21:51 UTC (rev 153)
@@ -13,43 +13,43 @@
<vlc id="if" param1="type value 1 =" />
<vlc id="rpn" param1="vlc_stop" />
<vlc id="rpn" param1="playlist_empty" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=1024 :sout-transcode-acodec=mpga :sout-transcode-ab=128 :sout-transcode-channels=2 :sout-transcode-samplerate=0 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay :sout-transcode-scale=0.65' strcat mrl value playlist_add vlc_play" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=1024 :sout-transcode-acodec=mpga :sout-transcode-ab=128 :sout-transcode-channels=2 :sout-transcode-samplerate=44100 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay :sout-transcode-scale=0.65' strcat mrl value playlist_add vlc_play" />
<vlc id="end" />
<!-- audio/video ajout\xE9 et transcod\xE9 normalement TV - Type 2 -->
<vlc id="if" param1="type value 2 =" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=1024 :sout-transcode-acodec=mpga :sout-transcode-ab=128 :sout-transcode-channels=2 :sout-transcode-samplerate=0 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay :sout-transcode-scale=0.65' strcat mrl value playlist_add" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=1024 :sout-transcode-acodec=mpga :sout-transcode-ab=128 :sout-transcode-channels=2 :sout-transcode-samplerate=44100 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay :sout-transcode-scale=0.65' strcat mrl value playlist_add" />
<vlc id="end" />
<!-- audio/video jou\xE9 et transcod\xE9 avec sortie sur PC - Type 3 -->
<vlc id="if" param1="type value 3 =" />
<vlc id="rpn" param1="vlc_stop" />
<vlc id="rpn" param1="playlist_empty" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout=#duplicate{dst=transcode:std,select=video,dst=display,select=audio} :sout-transcode-vcodec=mp2v :sout-transcode-vb=1024 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=0 :sout-transcode-ab=128 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay :sout-transcode-scale=0.65' strcat mrl value playlist_add vlc_play" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout=#duplicate{dst=transcode:std,select=video,dst=display,select=audio} :sout-transcode-vcodec=mp2v :sout-transcode-vb=1024 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=44100 :sout-transcode-ab=128 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay :sout-transcode-scale=0.65' strcat mrl value playlist_add vlc_play" />
<vlc id="end" />
<!-- audio/video ajout\xE9 et transcod\xE9 avec sortie sur PC - Type 4 -->
<vlc id="if" param1="type value 4 =" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout=#duplicate{dst=transcode:std,select=video,dst=display,select=audio} :sout-transcode-vcodec=mp2v :sout-transcode-vb=1024 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=0 :sout-transcode-ab=128 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay :sout-transcode-scale=0.65' strcat mrl value playlist_add" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout=#duplicate{dst=transcode:std,select=video,dst=display,select=audio} :sout-transcode-vcodec=mp2v :sout-transcode-vb=1024 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=44100 :sout-transcode-ab=128 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay :sout-transcode-scale=0.65' strcat mrl value playlist_add" />
<vlc id="end" />
<!-- audio/video jou\xE9 et transcod\xE9 avec sortie en AC3 - Type 5 -->
<vlc id="if" param1="type value 5 =" />
<vlc id="rpn" param1="vlc_stop" />
<vlc id="rpn" param1="playlist_empty" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=1024 :sout-transcode-ab=128 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=0 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay :sout-transcode-scale=0.65' strcat mrl value playlist_add vlc_play" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=1024 :sout-transcode-ab=128 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=44100 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay :sout-transcode-scale=0.65' strcat mrl value playlist_add vlc_play" />
<vlc id="end" />
<!-- audio/video ajout\xE9 et transcod\xE9 avec sortie en AC3 - Type 6 -->
<vlc id="if" param1="type value 6 =" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=1024 :sout-transcode-ab=128 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=0 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay :sout-transcode-scale=0.65' strcat mrl value playlist_add" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=1024 :sout-transcode-ab=128 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=44100 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay :sout-transcode-scale=0.65' strcat mrl value playlist_add" />
<vlc id="end" />
<!-- messagerie audio - Type 7 -->
<vlc id="if" param1="type value 7 =" />
<vlc id="rpn" param1="vlc_stop" />
<vlc id="rpn" param1="playlist_empty" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=128 :sout-transcode-acodec=mpga :sout-transcode-channels=2 :sout-transcode-samplerate=0' strcat mrl value playlist_add vlc_play" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=128 :sout-transcode-acodec=mpga :sout-transcode-channels=2 :sout-transcode-samplerate=44100' strcat mrl value playlist_add vlc_play" />
<vlc id="end" />
<!-- Fichiers photos -->
@@ -103,36 +103,36 @@
<vlc id="if" param1="type value 30 =" />
<vlc id="rpn" param1="vlc_stop" />
<vlc id="rpn" param1="playlist_empty" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=128 :sout-transcode-acodec=mpga :sout-transcode-channels=2 :sout-transcode-samplerate=0 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add vlc_play" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=128 :sout-transcode-acodec=mpga :sout-transcode-channels=2 :sout-transcode-samplerate=44100 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add vlc_play" />
<vlc id="end" />
<!-- dvd jou\xE9 normalement - sortie audio PC - Type 31 -->
<vlc id="if" param1="type value 31 =" />
<vlc id="rpn" param1="vlc_stop" />
<vlc id="rpn" param1="playlist_empty" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout=#duplicate{dst=transcode:std,select=video,dst=display,select=audio} :sout-transcode-ab=128 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=0 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add vlc_play" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout=#duplicate{dst=transcode:std,select=video,dst=display,select=audio} :sout-transcode-ab=128 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=44100 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add vlc_play" />
<vlc id="end" />
<!-- dvd jou\xE9 normalement - Sortie AC3 audio - Type 32 -->
<vlc id="if" param1="type value 32 =" />
<vlc id="rpn" param1="vlc_stop" />
<vlc id="rpn" param1="playlist_empty" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=128 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=0 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add vlc_play" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=128 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=44100 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add vlc_play" />
<vlc id="end" />
<!-- dvd ajout\xE9 normalement - transcodage audio - Type 33 -->
<vlc id="if" param1="type value 33 =" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=128 :sout-transcode-acodec=mpga :sout-transcode-channels=2 :sout-transcode-samplerate=0 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=128 :sout-transcode-acodec=mpga :sout-transcode-channels=2 :sout-transcode-samplerate=44100 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add" />
<vlc id="end" />
<!-- dvd ajout\xE9 normalement - sortie audio PC - Type 34 -->
<vlc id="if" param1="type value 34 =" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout=#duplicate{dst=transcode:std,select=video,dst=display,select=audio} :sout-transcode-ab=128 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=0 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout=#duplicate{dst=transcode:std,select=video,dst=display,select=audio} :sout-transcode-ab=128 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=44100 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add" />
<vlc id="end" />
<!-- dvd ajout\xE9 normalement - Sortie AC3 audio - Type 35 -->
<vlc id="if" param1="type value 35 =" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=128 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=0 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=128 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=44100 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add" />
<vlc id="end" />
<!-- MMS -->
Modified: trunk/http-vlc/lecteur/play-wifi.html
===================================================================
--- trunk/http-vlc/lecteur/play-wifi.html 2007-05-18 12:36:05 UTC (rev 152)
+++ trunk/http-vlc/lecteur/play-wifi.html 2007-05-20 10:21:51 UTC (rev 153)
@@ -13,43 +13,43 @@
<vlc id="if" param1="type value 1 =" />
<vlc id="rpn" param1="vlc_stop" />
<vlc id="rpn" param1="playlist_empty" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=2048 :sout-transcode-acodec=mpga :sout-transcode-ab=128 :sout-transcode-channels=2 :sout-transcode-samplerate=0 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay :sout-transcode-scale=0.80' strcat mrl value playlist_add vlc_play" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=2048 :sout-transcode-acodec=mpga :sout-transcode-ab=128 :sout-transcode-channels=2 :sout-transcode-samplerate=44100 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay :sout-transcode-scale=0.80' strcat mrl value playlist_add vlc_play" />
<vlc id="end" />
<!-- audio/video ajout\xE9 et transcod\xE9 normalement TV - Type 2 -->
<vlc id="if" param1="type value 2 =" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=2048 :sout-transcode-acodec=mpga :sout-transcode-ab=128 :sout-transcode-channels=2 :sout-transcode-samplerate=0 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay :sout-transcode-scale=0.80' strcat mrl value playlist_add" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=2048 :sout-transcode-acodec=mpga :sout-transcode-ab=128 :sout-transcode-channels=2 :sout-transcode-samplerate=44100 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay :sout-transcode-scale=0.80' strcat mrl value playlist_add" />
<vlc id="end" />
<!-- audio/video jou\xE9 et transcod\xE9 avec sortie sur PC - Type 3 -->
<vlc id="if" param1="type value 3 =" />
<vlc id="rpn" param1="vlc_stop" />
<vlc id="rpn" param1="playlist_empty" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout=#duplicate{dst=transcode:std,select=video,dst=display,select=audio} :sout-transcode-vcodec=mp2v :sout-transcode-channels=6 :sout-transcode-samplerate=0 :sout-transcode-vb=2048 :sout-transcode-acodec=a52 :sout-transcode-ab=128 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay :sout-transcode-scale=0.80' strcat mrl value playlist_add vlc_play" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout=#duplicate{dst=transcode:std,select=video,dst=display,select=audio} :sout-transcode-vcodec=mp2v :sout-transcode-channels=6 :sout-transcode-samplerate=44100 :sout-transcode-vb=2048 :sout-transcode-acodec=a52 :sout-transcode-ab=128 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay :sout-transcode-scale=0.80' strcat mrl value playlist_add vlc_play" />
<vlc id="end" />
<!-- audio/video ajout\xE9 et transcod\xE9 avec sortie sur PC - Type 4 -->
<vlc id="if" param1="type value 4 =" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout=#duplicate{dst=transcode:std,select=video,dst=display,select=audio} :sout-transcode-vcodec=mp2v :sout-transcode-vb=2048 :sout-transcode-channels=6 :sout-transcode-samplerate=0 :sout-transcode-acodec=a52 :sout-transcode-ab=128 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay :sout-transcode-scale=0.80' strcat mrl value playlist_add" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout=#duplicate{dst=transcode:std,select=video,dst=display,select=audio} :sout-transcode-vcodec=mp2v :sout-transcode-vb=2048 :sout-transcode-channels=6 :sout-transcode-samplerate=44100 :sout-transcode-acodec=a52 :sout-transcode-ab=128 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay :sout-transcode-scale=0.80' strcat mrl value playlist_add" />
<vlc id="end" />
<!-- audio/video jou\xE9 et transcod\xE9 avec sortie en AC3 - Type 5 -->
<vlc id="if" param1="type value 5 =" />
<vlc id="rpn" param1="vlc_stop" />
<vlc id="rpn" param1="playlist_empty" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=2048 :sout-transcode-ab=256 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=0 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay :sout-transcode-scale=0.80' strcat mrl value playlist_add vlc_play" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=2048 :sout-transcode-ab=256 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=44100 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay :sout-transcode-scale=0.80' strcat mrl value playlist_add vlc_play" />
<vlc id="end" />
<!-- audio/video ajout\xE9 et transcod\xE9 avec sortie en AC3 - Type 6 -->
<vlc id="if" param1="type value 6 =" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=2048 :sout-transcode-ab=256 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=0 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay :sout-transcode-scale=0.80' strcat mrl value playlist_add" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=2048 :sout-transcode-ab=256 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=44100 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay :sout-transcode-scale=0.80' strcat mrl value playlist_add" />
<vlc id="end" />
<!-- messagerie audio - Type 7 -->
<vlc id="if" param1="type value 7 =" />
<vlc id="rpn" param1="vlc_stop" />
<vlc id="rpn" param1="playlist_empty" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=128 :sout-transcode-acodec=mpga :sout-transcode-channels=2 :sout-transcode-samplerate=0' strcat mrl value playlist_add vlc_play" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=128 :sout-transcode-acodec=mpga :sout-transcode-channels=2 :sout-transcode-samplerate=44100' strcat mrl value playlist_add vlc_play" />
<vlc id="end" />
<!-- Fichiers photos -->
@@ -103,36 +103,36 @@
<vlc id="if" param1="type value 30 =" />
<vlc id="rpn" param1="vlc_stop" />
<vlc id="rpn" param1="playlist_empty" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=128 :sout-transcode-acodec=mpga :sout-transcode-channels=2 :sout-transcode-samplerate=0 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add vlc_play" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=128 :sout-transcode-acodec=mpga :sout-transcode-channels=2 :sout-transcode-samplerate=44100 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add vlc_play" />
<vlc id="end" />
<!-- dvd jou\xE9 normalement - sortie audio PC - Type 31 -->
<vlc id="if" param1="type value 31 =" />
<vlc id="rpn" param1="vlc_stop" />
<vlc id="rpn" param1="playlist_empty" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout=#duplicate{dst=transcode:std,select=video,dst=display,select=audio} :sout-transcode-ab=128 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=0 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add vlc_play" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout=#duplicate{dst=transcode:std,select=video,dst=display,select=audio} :sout-transcode-ab=128 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=44100 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add vlc_play" />
<vlc id="end" />
<!-- dvd jou\xE9 normalement - Sortie AC3 audio - Type 32 -->
<vlc id="if" param1="type value 32 =" />
<vlc id="rpn" param1="vlc_stop" />
<vlc id="rpn" param1="playlist_empty" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=256 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=0 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add vlc_play" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=256 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=44100 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add vlc_play" />
<vlc id="end" />
<!-- dvd ajout\xE9 normalement - transcodage audio - Type 33 -->
<vlc id="if" param1="type value 33 =" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=128 :sout-transcode-acodec=mpga :sout-transcode-channels=2 :sout-transcode-samplerate=0 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=128 :sout-transcode-acodec=mpga :sout-transcode-channels=2 :sout-transcode-samplerate=44100 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add" />
<vlc id="end" />
<!-- dvd ajout\xE9 normalement - sortie audio PC - Type 34 -->
<vlc id="if" param1="type value 34 =" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout=#duplicate{dst=transcode:std,select=video,dst=display,select=audio} :sout-transcode-ab=128 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=0 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout=#duplicate{dst=transcode:std,select=video,dst=display,select=audio} :sout-transcode-ab=128 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=44100 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add" />
<vlc id="end" />
<!-- dvd ajout\xE9 normalement - Sortie AC3 audio - Type 35 -->
<vlc id="if" param1="type value 35 =" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=256 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=0 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=256 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=44100 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add" />
<vlc id="end" />
<!-- MMS -->
Modified: trunk/http-vlc/lecteur/play.html
===================================================================
--- trunk/http-vlc/lecteur/play.html 2007-05-18 12:36:05 UTC (rev 152)
+++ trunk/http-vlc/lecteur/play.html 2007-05-20 10:21:51 UTC (rev 153)
@@ -13,36 +13,36 @@
<vlc id="if" param1="type value 1 =" />
<vlc id="rpn" param1="vlc_stop" />
<vlc id="rpn" param1="playlist_empty" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=4096 :sout-transcode-acodec=mpga :sout-transcode-ab=256 :sout-transcode-channels=2 :sout-transcode-samplerate=0 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay' strcat mrl value playlist_add vlc_play" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=4096 :sout-transcode-acodec=mpga :sout-transcode-ab=256 :sout-transcode-channels=2 :sout-transcode-samplerate=44100 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay' strcat mrl value playlist_add vlc_play" />
<vlc id="end" />
<!-- audio/video ajoute et transcode normalement TV - Type 2 -->
<vlc id="if" param1="type value 2 =" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=4096 :sout-transcode-acodec=mpga :sout-transcode-ab=256 :sout-transcode-channels=2 :sout-transcode-samplerate=0 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay' strcat mrl value playlist_add" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=4096 :sout-transcode-acodec=mpga :sout-transcode-ab=256 :sout-transcode-channels=2 :sout-transcode-samplerate=44100 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay' strcat mrl value playlist_add" />
<vlc id="end" />
<!-- audio/video joue et transcode avec sortie sur PC - Type 3 -->
<vlc id="if" param1="type value 3 =" />
<vlc id="rpn" param1="vlc_stop" />
<vlc id="rpn" param1="playlist_empty" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout=#duplicate{dst=transcode:std,select=video,dst=display,select=audio} :sout-transcode-vcodec=mp2v :sout-transcode-vb=4096 :sout-transcode-acodec=a52 :sout-transcode-ab=512 :sout-transcode-channels=6 :sout-transcode-samplerate=0 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay' strcat mrl value playlist_add vlc_play" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout=#duplicate{dst=transcode:std,select=video,dst=display,select=audio} :sout-transcode-vcodec=mp2v :sout-transcode-vb=4096 :sout-transcode-acodec=a52 :sout-transcode-ab=512 :sout-transcode-channels=6 :sout-transcode-samplerate=44100 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay' strcat mrl value playlist_add vlc_play" />
<vlc id="end" />
<!-- audio/video ajoute et transcode avec sortie sur PC - Type 4 -->
<vlc id="if" param1="type value 4 =" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout=#duplicate{dst=transcode:std,select=video,dst=display,select=audio} :sout-transcode-vcodec=mp2v :sout-transcode-vb=4096 :sout-transcode-acodec=a52 :sout-transcode-ab=512 :sout-transcode-channels=6 :sout-transcode-samplerate=0 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay' strcat mrl value playlist_add" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout=#duplicate{dst=transcode:std,select=video,dst=display,select=audio} :sout-transcode-vcodec=mp2v :sout-transcode-vb=4096 :sout-transcode-acodec=a52 :sout-transcode-ab=512 :sout-transcode-channels=6 :sout-transcode-samplerate=44100 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay' strcat mrl value playlist_add" />
<vlc id="end" />
<!-- audio/video joue et transcode avec sortie en AC3 - Type 5 -->
<vlc id="if" param1="type value 5 =" />
<vlc id="rpn" param1="vlc_stop" />
<vlc id="rpn" param1="playlist_empty" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=4096 :sout-transcode-ab=512 :sout-transcode-channels=6 :sout-transcode-acodec=a52 :sout-transcode-samplerate=0 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay' strcat mrl value playlist_add vlc_play" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=4096 :sout-transcode-ab=512 :sout-transcode-channels=6 :sout-transcode-acodec=a52 :sout-transcode-samplerate=44100 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay' strcat mrl value playlist_add vlc_play" />
<vlc id="end" />
<!-- audio/video ajoute et transcode avec sortie en AC3 - Type 6 -->
<vlc id="if" param1="type value 6 =" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=4096 :sout-transcode-ab=512 :sout-transcode-channels=6 :sout-transcode-acodec=a52 :sout-transcode-samplerate=0 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay' strcat mrl value playlist_add" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=4096 :sout-transcode-ab=512 :sout-transcode-channels=6 :sout-transcode-acodec=a52 :sout-transcode-samplerate=44100 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay' strcat mrl value playlist_add" />
<vlc id="end" />
<!-- messagerie audio - Type 7 -->
@@ -122,17 +122,17 @@
<!-- dvd ajoute normalement - transcodage audio - Type 33 -->
<vlc id="if" param1="type value 33 =" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=256 :sout-transcode-acodec=mpga :sout-transcode-channels=2 :sout-transcode-samplerate=0 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=256 :sout-transcode-acodec=mpga :sout-transcode-channels=2 :sout-transcode-samplerate=44100 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add" />
<vlc id="end" />
<!-- dvd ajoute normalement - sortie audio PC - Type 34 -->
<vlc id="if" param1="type value 34 =" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout=#duplicate{dst=transcode:std,select=video,dst=display,select=audio} :sout-transcode-ab=512 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=0 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout=#duplicate{dst=transcode:std,select=video,dst=display,select=audio} :sout-transcode-ab=512 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=44100 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add" />
<vlc id="end" />
<!-- dvd ajoute normalement - Sortie AC3 audio - Type 35 -->
<vlc id="if" param1="type value 35 =" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=512 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=0 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=512 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=44100 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add" />
<vlc id="end" />
<!-- MMS -->
Modified: trunk/http-vlc/lecteur/set_option.html
===================================================================
--- trunk/http-vlc/lecteur/set_option.html 2007-05-18 12:36:05 UTC (rev 152)
+++ trunk/http-vlc/lecteur/set_option.html 2007-05-20 10:21:51 UTC (rev 153)
@@ -1,4 +1,5 @@
<!-- Modification de la sortie Audio - Type 0 -->
<vlc id="rpn" param1="'' 'sub-language' vlc_config_set"/>
<vlc id="rpn" param1="'' 'audio-language' vlc_config_set"/>
+ <vlc id="rpn" param1="'2' 'avi-index' vlc_config_set"/>
<vlc id="rpn" param1="vlc_config_save" />
Modified: trunk/module/_explorateur/explorateur.tpl
===================================================================
--- trunk/module/_explorateur/explorateur.tpl 2007-05-18 12:36:05 UTC (rev 152)
+++ trunk/module/_explorateur/explorateur.tpl 2007-05-20 10:21:51 UTC (rev 153)
@@ -98,8 +98,8 @@
{*######## Fin Affichage des raccourcis rapides ########*}
-{if !$_multipage.is_first_page}
- <tr><td colspan="2">{precedent}<font size="1"> <a href="{$PAGE_EXPLO}?start=0&directory={$REP|urlencode}&mode={$MODE}">D\xE9but du r\xE9pertoire</a></font></td></tr>
+{if !$_multipage.is_first_page}
+ <tr><td colspan="2">{precedent}<font size=1> - <a href="{$PAGE_EXPLO}?start=0&directory={$REP|urlencode}&mode={$MODE}">D\xE9but du r\xE9pertoire</a></font></td></tr>
{/if}
{if $Nb_rep_path >='2' AND $MIN==0}
@@ -143,13 +143,17 @@
{/if}
{/section}
- <tr><td colspan="2"><table><tr><td>{if !$_multipage.is_last_page}{suivant}<font size=1> - <a href="{$PAGE_EXPLO}?start={$_multipage.min_max}&directory={$REP|urlencode}&mode={$MODE}">Fin du r\xE9pertoire</a> - </font>{/if}{pagination}</td>
+ <tr><td colspan="2"><table width="498" border="0" cellpadding="0" cellspacing="0"><tr><td>{if !$_multipage.is_last_page}{suivant}<font size=1> - <a href="{$PAGE_EXPLO}?start={$_multipage.min_max}&directory={$REP|urlencode}&mode={$MODE}">Fin du r\xE9pertoire</a> - </font>{/if}{pagination}</td>
-<td width="30" align="center">
-{if $PLAYREP}
-<a href="{$PAGE_LECT_REP}?toplay={$REP|urlencode}&type=playrep" onfocus='aide="{if $IS_DVD}Lire le dossier en tant que DVD{else}Lire le dossier en entier{/if}";'><table width="20" height="20" border="0" cellpadding="0" cellspacing="0" bgcolor="{#COULEUR_FOND1#}" abgcolor="{#COULEUR_ALINK#}"><tr height="20"><td align=center width="20" height="20" align="center" valign="middle"><img src="{$SKIN_REP}dossier/rep_all.gif" border="0" width="20" height="20"></td></tr></table></a>
+<td width="20">
+{if $MP3}
+ <a href="{$PAGE_LECT_REP}?toplay={$REP|urlencode}&directory={$REP|urlencode}&start={$MIN}&mode=exp&type=playrep" onfocus='aide="Lire le dossier en entier";'><table width="20" height="20" border="0" cellpadding="0" cellspacing="0" bgcolor="{#COULEUR_FOND2#}" abgcolor="{#COULEUR_ALINK#}"><tr height="20"><td align=center width="20" height="20" align="center" valign="middle"><img src="{$INTERFACE_REP}/jouer.gif" border="0" width="20" height="20"></td></tr></table></a>
+</td><td width="2"><img src="blank.gif" width="2" height="1"></td><td width="20">
+ <a href="{$PAGE_LECT_REP}?toplay={$REP|urlencode}&directory={$REP|urlencode}&start={$MIN}&mode=exp&type=playrep&option=1" onfocus='aide="Ajouter le dossier en entier";'><table width="20" height="20" border="0" cellpadding="0" cellspacing="0" bgcolor="{#COULEUR_FOND2#}" abgcolor="{#COULEUR_ALINK#}"><tr height="20"><td align=center width="20" height="20" align="center" valign="middle"><img src="{$INTERFACE_REP}/ajouter.gif" border="0" width="20" height="20"></td></tr></table></a>
+{elseif $PLAYREP}
+ <a href="{$PAGE_LECT_REP}?toplay={$REP|urlencode}&type=playrep" onfocus='aide="{if $IS_DVD}Lire le dossier en tant que DVD{else}Lire le dossier en entier{/if}";'><table width="20" height="20" border="0" cellpadding="0" cellspacing="0" bgcolor="{#COULEUR_FOND1#}" abgcolor="{#COULEUR_ALINK#}"><tr height="20"><td align=center width="20" height="20" align="center" valign="middle"><img src="{$SKIN_REP}dossier/rep_all.gif" border="0" width="20" height="20"></td></tr></table></a>
{/if}
-</td><td width="30" align="center">
+</td><td width="2"><img src="blank.gif" width="2" height="1"></td><td width="20" align="center">
{if $AFF_FAVORIS}
<a href="{$RACINE_REP}module/favoris/index1.php?ajout={$REP|urlencode}&nom={$REP}" onfocus='aide="Ajouter le dossier aux favoris";'><table width="20" height="20" border="0" cellpadding="0" cellspacing="0" bgcolor="{#COULEUR_FOND1#}" abgcolor="{#COULEUR_ALINK#}"><tr height="20"><td align=center width="20" height="20" align="center" valign="middle"><img src="{$SKIN_REP}dossier/favoris.gif" border="0" width="20" height="20"></td></tr></table></a>
{/if}
Modified: trunk/module/_explorateur/index1.php
===================================================================
--- trunk/module/_explorateur/index1.php 2007-05-18 12:36:05 UTC (rev 152)
+++ trunk/module/_explorateur/index1.php 2007-05-20 10:21:51 UTC (rev 153)
@@ -172,6 +172,10 @@
$min = ($_GET['page']-1)*14;
}
+if($lecteur_audio){
+ $option_liens = 'mode=exp&directory='.urlencode($rep).'&';
+}
+
$smarty->assign('AFF_CDDA',$aff_cdda=="1" && strlen($rep_copy)<=3 && (PHP_OS == "WIN32" || PHP_OS == "WINNT"));
$smarty->assign('AFF_LECTEUR',$dir_lecteur);
$smarty->assign('AFF_FAVORIS',$aff_favoris);
Modified: trunk/module/clips/play_clip.php
===================================================================
--- trunk/module/clips/play_clip.php 2007-05-18 12:36:05 UTC (rev 152)
+++ trunk/module/clips/play_clip.php 2007-05-20 10:21:51 UTC (rev 153)
@@ -22,8 +22,9 @@
$url = 'http://launchtoday.fr.launch.yahoo.com/player/medialog.asp?vid='.$id.'&bw=510&mf=1&pid=505&ps=0&p1=2&p2=21&p3=2&rpid=35&pv=10&bp=Windows%2520NT&csid=791020104&uid=1886812234&pguid=einsJELEt4VkQCKMov00bg&etid=0&uguid=3e5u3891dirro&fcv=&mh='.$mh.'&z=ms.asx';
save_variable('backToURL', dirname($_SERVER['SCRIPT_NAME']).'/index1.php?show='.$_GET['show'].'&start='.$_GET['min'].'&lettre='.$_GET['lettre'].'&string='.$_GET['string']);
- play_fichier('type=40',$url,0,'backToURL');
-
+ //play_fichier('type=40',$url,0,'backToURL');
+ play_fichier('type=40','http://video.stage6.com/1198169/.divx',0,'backToURL');
+
$LINK['stop']=$MODULE.'films/lecture.php?control=stop';
$LINK['play']=$MODULE.'films/lecture.php?control=play';
$LINK['pause']=$MODULE.'films/lecture.php?control=pause';
@@ -45,7 +46,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<html>
<head>
-<meta name="refresh" content="0;url=../films/lecture.php">
+<meta name="refresh" content="8;url=../films/lecture.php">
<script language="javascript" src="/fb2ie.js">
</script>
</head>
Modified: trunk/module/dailymotion/index1.php
===================================================================
--- trunk/module/dailymotion/index1.php 2007-05-18 12:36:05 UTC (rev 152)
+++ trunk/module/dailymotion/index1.php 2007-05-20 10:21:51 UTC (rev 153)
@@ -22,13 +22,9 @@
foreach($item->xpath('media:thumbnail') as $k){
$img = $k['url'];
}
- foreach($item->xpath('enclosure') as $k){
- $url = $k['url'];
- $length = intval($k['length']);
- }
$vid = $item->xpath('media:group/media:content');
- $retour[] = array('temps'=>date('i:s',$length), 'titre'=>utf8_decode($item->title), 'url'=>$vid[0]['url'], 'img'=>$img);
+ $retour[] = array('temps'=>date('i:s',intval($vid[0]['duration'])), 'titre'=>utf8_decode($item->title), 'url'=>$vid[0]['url'], 'img'=>$img);
}
}
return($retour);
Modified: trunk/module/films/fichefilm.php
===================================================================
--- trunk/module/films/fichefilm.php 2007-05-18 12:36:05 UTC (rev 152)
+++ trunk/module/films/fichefilm.php 2007-05-20 10:21:51 UTC (rev 153)
@@ -93,7 +93,7 @@
}
}
- if(count($info['ba'])){
+ if(count($info['ba'])>0){
foreach($info['ba'] as $key=>$ba){
$t = explode(' - ',$ba['nom']);
$info['ba'][$key]['nom'] = stripslashes($t[1]);
Modified: trunk/module/films/films.tpl
===================================================================
--- trunk/module/films/films.tpl 2007-05-18 12:36:05 UTC (rev 152)
+++ trunk/module/films/films.tpl 2007-05-20 10:21:51 UTC (rev 153)
@@ -51,10 +51,16 @@
<select name=display_scaling>
<option value=letterbox>Letterbox
-<option value=panscan>Pan Scan
+<option value=panscan>Panscan
<option value=fullscreen>Fullscreen
</select>
-
+<br>
+<select name=display_aspect_ratio_conversion>
+<option value=letterbox>Letterbox
+<option value=combined>Combined
+<option value=panscan>Panscan
+<option value=ignore>Ignore
+</select>
<table width="500" align="left">
<tr><td width="90">Lumi\xE9re</td><td width="5">:</td><td><input bgcolor="{#COULEUR_FOND_RADIO#}" type=hslider name=denc_brightness min=0 max=255 grad=16></td></tr>
<tr><td width="90">Contraste</td><td width="5">:</td><td><input bgcolor="{#COULEUR_FOND_RADIO#}" type=hslider name=denc_contrast min='-128' max=127 grad=16></td></tr>
Modified: trunk/module/films/lecture.php
===================================================================
--- trunk/module/films/lecture.php 2007-05-18 12:36:05 UTC (rev 152)
+++ trunk/module/films/lecture.php 2007-05-20 10:21:51 UTC (rev 153)
@@ -3,58 +3,45 @@
require($RACINE_REP.'_framework/framework.php');
$BACKGROUND = 'none';
$cansetfrontpannel = true;
-if($VLC['type_current']!='webtv' AND $VLC['duree_totale']>=5 AND $VLC['duree_restante']<=5)
-{
+
+
+if($VLC['type_current']!='webtv' AND $VLC['duree_totale']>=5){
set_refresh($VLC['duree_restante'], $VLC['duree_restante'].';url=lecture.php?control=stop&signet=noload&theend=1',true);
}
-
$META['front_panel'] = strtoupper($VLC['etat']);
-//Si aucune frame vid\xE9o n'est affich\xE9e :
-if($VLC['etat']=='Playing' OR $_REQUEST['control']=='pause'){
- $META['nopicture'] = '20;url=lecture.php?control=stop&signet=noload&errorload=1';
-}else{
- $META['nopicture'] = 'none';
-}
-
$affiche ="";
-if (isset($_REQUEST['control']))
-{
- if($_REQUEST['control']=='stop')
- {
- if($_REQUEST['theend'])
- {
+if (isset($_REQUEST['control'])){
+
+ if($_REQUEST['control']=='stop'){
+
+ if($_REQUEST['theend']){
$message='Le fichier est termin\xE9...<br>';
- } elseif($_REQUEST['errorload'])
- {
+ }elseif($_REQUEST['errorload']){
$message='Il y a eu une erreur lors du chargement. Le fichier ou flux semble indisponible ou la freebox n\'arrive pas \xE0 l\'afficher...<br>';
}
- if($VLC['type_current']=="ba")
- {
+ if($VLC['type_current']=="ba"){
$message .= 'Redirection vers la fiche du film...';
set_refresh(0,'0;url='.$RACINE_REP.'module/films/fichefilm.php?film='.urlencode(get_variable('fiche_film')));
$file1 = file_get_contents('http://127.0.0.1:8081/lecteur/action.html?control='.$_REQUEST['control']);
- } elseif($VLC['type_current']=="jt")
- {
+ }elseif($VLC['type_current']=="jt"){
$message .= 'Redirection vers le menu des JT...';
- set_refresh(2,'2;url='.page_retour_film(),true);
+ set_refresh(1,'1;url='.page_retour_film(),true);
$file1 = file_get_contents('http://127.0.0.1:8081/lecteur/action.html?control='.$_REQUEST['control']);
- } elseif($VLC['type_current']=="ba_allocine") // __JF
- {
+ }elseif($VLC['type_current']=="ba_allocine"){
$message .= 'Redirection vers les bandes annonces...';
- set_refresh(0,'0;url='.$RACINE_REP.'module/allocine/index1.php?start='.get_variable('start'));
+ set_refresh(1,'1;url='.$RACINE_REP.'module/allocine/index1.php?start='.get_variable('start'));
$file1 = file_get_contents('http://127.0.0.1:8081/lecteur/action.html?control='.$_REQUEST['control']);
- } elseif($VLC['type_current']=="backToURL") {// __JF
+ }elseif($VLC['type_current']=="backToURL"){
$message .= 'Redirection vers la page pr\xE9c\xE9dente...';
- set_refresh(0,'0;url='.get_variable('backToURL'));
+ set_refresh(1,'1;url='.get_variable('backToURL'));
$file1 = file_get_contents('http://127.0.0.1:8081/lecteur/action.html?control='.$_REQUEST['control']);
- } elseif($VLC['type_current']=="dvd") {
+ }elseif($VLC['type_current']=="dvd"){
$message .= 'Redirection vers les DVD...';
- set_refresh(2,'2;url='.page_retour_film(),true);
+ set_refresh(1,'1;url='.page_retour_film(),true);
$file1 = file_get_contents('http://127.0.0.1:8081/lecteur/action.html?control='.$_REQUEST['control']);
- } elseif($_GET['signet'] == "load")
- {
+ }elseif($_GET['signet'] == "load"){
$db = sqlite_open($USER.'utilisateur.db', 0666);
$requete='INSERT INTO signet VALUES(NULL,
\''.sqlite_escape_string($signetsav[2]).'\',
@@ -64,24 +51,19 @@
$message.= 'Un signet pour le fichier en cours a \xE9t\xE9 enregistr\xE9. Pour reprendre la lecture du film ult\xE9rieurement, rendez-vous dans la section signets ! <br><br>';
$message.= 'Film : '.$signetsav[2].'<br><br>Temps : '.$signetsav[1].'<br><br>';
$message.= 'Redirection vers vos fichiers vid\xE9os...';
-
sqlite_close($db);
set_refresh(2,'2;url='.page_retour_film(),true);
$file1 = file_get_contents('http://127.0.0.1:8081/lecteur/action.html?control='.$_REQUEST['control']);
- } elseif ($_GET['signet'] == "noload")
- {
+ }elseif ($_GET['signet'] == "noload"){
$message .= 'Redirection vers vos fichiers vid\xE9os...';
set_refresh(2,'2;url='.page_retour_film(),true);
$file1 = file_get_contents('http://127.0.0.1:8081/lecteur/action.html?control='.$_REQUEST['control']);
- } elseif($VLC['type_current']=="webtv")
- {
+ }elseif($VLC['type_current']=="webtv"){
$message .= 'Redirection vers les Webtv...';
set_refresh(2,'2;url='.page_retour_film(),true);
$file1 = file_get_contents('http://127.0.0.1:8081/lecteur/action.html?control='.$_REQUEST['control']);
- } else
- {
- // Micht : Utilisation d'une page de skin
+ }else{
$message = $smarty->fetch('signet_ask.tpl');
}
} elseif($_REQUEST['control']!='seek')
@@ -93,6 +75,15 @@
}
}
+/*
+//Si aucune frame vid\xE9o n'est affich\xE9e :
+if($VLC['etat']=='Playing' OR ($VLC['etat']=='Playing' AND $_REQUEST['control']=='pause')){
+ $META['nopicture'] = '20;url=lecture.php?control=stop&signet=noload&errorload=1';
+}else{
+ $META['nopicture'] = '';
+}
+*/
+
//Affiche les r\xE9sultats du livescore
if(get_variable('surv_page')!='' AND get_variable('surv_match')!='' AND (get_variable('last_timestamp')+30)<time())
{
@@ -158,9 +149,6 @@
set_refresh(60,'60;url=lecture.php');
}
-
-
-
//Enregistrer un signet
if($_GET['savesignet']==1)
{
@@ -170,8 +158,7 @@
}
//-- Avancer ou reculer
-if (isset($_REQUEST['seek_value']))
-{
+if (isset($_REQUEST['seek_value'])){
if($_REQUEST['seek_value']=="moins")
{
$value='-1m';
@@ -195,32 +182,20 @@
}
// Gestion des sous-titres
-if(isset($_REQUEST['next_ss']) or isset($_REQUEST['newfichier']))
-{
+if(isset($_REQUEST['next_ss']) or isset($_REQUEST['newfichier'])){
$sstitre=array();
+ eval(file_get_contents('http://localhost:8081/lecteur/options_vlc.html'));
- //-- R\xE9cuperation des donn\xE9es de VLC
- $page = @fopen ('http://localhost:8081/lecteur/options_vlc.html', 'r');
- $contenu_html = '';
- while (!feof ($page))
- {
- $contenu_html .= trim(fgets($page, 4096));
- }
- eval($contenu_html);
$n_sstitre = count($sstitre);
- if ($n_sstitre == '0')
- {
+ if ($n_sstitre == '0'){
$OSD .= "Pas de Sous-Titre";
$act = "non";
- } else
- {
+ }else{
$nn = '1';
- foreach ($sstitre as $key => $value)
- {
+ foreach ($sstitre as $key => $value){
$keysst[$nn] = $key;
$nomsst[$nn] = $value[0];
- if ($value[1] == '1')
- {
+ ...
[truncated message content] |
|
From: <gu...@us...> - 2007-05-18 12:36:07
|
Revision: 152
http://svn.sourceforge.net/easybox-mod/?rev=152&view=rev
Author: guyou
Date: 2007-05-18 05:36:05 -0700 (Fri, 18 May 2007)
Log Message:
-----------
iGel version 4.0.4
Added Paths:
-----------
tags/4.0.4/
Copied: tags/4.0.4 (from rev 145, trunk)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gu...@us...> - 2007-05-13 20:26:53
|
Revision: 151
http://svn.sourceforge.net/easybox-mod/?rev=151&view=rev
Author: guyou
Date: 2007-05-13 13:26:51 -0700 (Sun, 13 May 2007)
Log Message:
-----------
Enregistrement
Gestion de l'enregistrement via cron
Modified Paths:
--------------
trunk/lecteur/stop_rec.php
trunk/module/multiposte/add.php
trunk/module/multiposte/index1.php
Modified: trunk/lecteur/stop_rec.php
===================================================================
--- trunk/lecteur/stop_rec.php 2007-05-13 20:26:26 UTC (rev 150)
+++ trunk/lecteur/stop_rec.php 2007-05-13 20:26:51 UTC (rev 151)
@@ -1,5 +1,8 @@
<?php
+ $RACINE_REP = "../";
+ require($RACINE_REP.'_framework/framework.php');
+
$db = sqlite_open('../_utilisateur/records.db', 0666);
$requete='UPDATE records SET statut=\'Enregistr\xE9\' WHERE id='.$_GET['id'];
$result = sqlite_query($db,$requete);
@@ -11,8 +14,16 @@
@unlink($result['fichierbat']);
@unlink(ereg_replace(".bat","-end.bat",$result['fichierbat']));
- $at=exec('at '.$result['task'].' /delete');
- $at.=exec('at '.$result['taskend'].' /delete');
+ if (PHP_OS == "WIN32" || PHP_OS == "WINNT") {
+ $at=exec('at '.$result['task'].' /delete');
+ $at.=exec('at '.$result['taskend'].' /delete');
+ } else {
+ // Support eventuel de /etc/cron.d
+ $string1 = $result['fichierbat'];
+ $string2 = ereg_replace(".bat","-end.bat",$string1);
+ remove_from_cron($string1);
+ remove_from_cron($string2);
+ }
$file1 = @file_get_contents("http://127.0.0.1:8082/lecteur/action.html?control=shutdown");
Modified: trunk/module/multiposte/add.php
===================================================================
--- trunk/module/multiposte/add.php 2007-05-13 20:26:26 UTC (rev 150)
+++ trunk/module/multiposte/add.php 2007-05-13 20:26:51 UTC (rev 151)
@@ -7,6 +7,22 @@
$etape=$_GET['etape'];
$smarty->assign('etape',$etape);
+if (PHP_OS == "WIN32" || PHP_OS == "WINNT") {
+ $wxsystray='--wx-systray';
+ // This is DOS specific
+ $vlcdummyquiet="--dummy-quiet";
+ $vlcstart="start vlc\vlc.exe";
+ $wwwstartbeg="start ";
+ $wwwstartend="";
+} elseif (is_writable('/etc/cron.d/easybox')) {
+ $wxsystray='--no-wx-systray';
+ $vlcdummyquiet='-d --syslog';
+ $vlcstart="/usr/bin/vlc";
+ $wwwstartbeg="wget --quiet --output-document=/dev/null --output-file=/dev/null '";
+ $wwwstartend="'";
+}
+
+
$MENU_ALT=array(array('lien'=>'add.php', 'nom'=>'Nouvel enregistrement', 'selected'=>0),
array('lien'=>'index1.php?module=see', 'nom'=>'Programm\xE9s', 'selected'=>0),
array('lien'=>'/module/films/index1.php?directory='.urlencode($ini['multiposte']['multiposte']), 'nom'=>'Enregistr\xE9s', 'selected'=>0));
@@ -25,18 +41,28 @@
$id = $_GET['id'];
// Suppression des commandes et fichiers
- $at=shell_exec('at');
- if(eregi(urldecode($_GET['fichierbat']),$at))
- {
- $at=exec('at '.$_GET['task'].' /delete');
- $at.=exec('at '.$_GET['taskend'].' /delete');
- }
+ if (PHP_OS == "WIN32" || PHP_OS == "WINNT") {
+ $at=shell_exec('at');
+ if(eregi(urldecode($_GET['fichierbat']),$at))
+ {
+ $at=exec('at '.$_GET['task'].' /delete');
+ $at.=exec('at '.$_GET['taskend'].' /delete');
+ }
+ } else {
+ // Support eventuel de /etc/cron.d
+ $string1 = $_GET['fichierbat'];
+ $string2 = ereg_replace(".bat","-end.bat",$string1);
+ remove_from_cron($string1);
+ remove_from_cron($string2);
+ }
@unlink(urldecode($_GET['fichierbat']));
@unlink(ereg_replace(".bat","-end.bat",urldecode($_GET['fichierbat'])));
// Modification des commandes at et des fichiers bat
- $fichier = realpath($ini['multiposte']['multiposte']).'\\'.$chaine[1].' - '.date("d-m-y H\hi", $deb).'.mpg';
- $fichierbat = $chaine[1].' - '.date("d-m-y H\hi", $deb).'.bat';
+
+ // Note: le double slash est DOS specifique, or DOS comprend sans probleme le slash
+ $fichier = realpath($ini['multiposte']['multiposte']).'/'.$chaine[1].' - '.date("d-m-y H\hi", $deb).'.mpg';
+ $fichierbat = $chaine[1].' - '.date("d-m-y H\hi", $deb).'.bat';
$fichierbat2 = $chaine[1].' - '.date("d-m-y H\hi", $deb).'-end.bat';
//Cr\xE9ation du fichier bat de lancement
@@ -48,46 +74,58 @@
//Profils d'encodage
if($ini['multiposte']['cvid']!='none' AND $ini['multiposte']['caud']!='none'){
- $link = 'start vlc\vlc.exe --wx-systray --intf=dummy --extraintf=http --http-src="'.realpath(realpath("../../").'/http-vlc').'" --http-host=:8082 --http-charset=ISO-8859-1 --quiet --dummy-quiet -vvv rtsp://mafreebox.freebox.fr/freeboxtv/'.$moreinfo.$chaine[2].' --sout=#transcode{vcodec='.$ini['multiposte']['cvid'].',vb='.$ini['multiposte']['bvid'].',scale=1,acodec='.$ini['multiposte']['caud'].',ab='.$ini['multiposte']['baud'].',channels=2} --sout=#duplicate{dst=std{access=file,mux='.$ini['multiposte']['muxer'].',url="'.$fichier.'"}
- start http://localhost:8080/lecteur/lunch_rec.php?id='.$id;
+ $link = $vlcstart.' '.$wxsystray.' --intf=dummy --extraintf=http --http-src="'.realpath(realpath("../../").'/http-vlc').'" --http-host=:8082 --http-charset=ISO-8859-1 --quiet '.$vlcdummyquiet.' -vvv rtsp://mafreebox.freebox.fr/freeboxtv/'.$moreinfo.$chaine[2].' --sout=#transcode{vcodec='.$ini['multiposte']['cvid'].',vb='.$ini['multiposte']['bvid'].',scale=1,acodec='.$ini['multiposte']['caud'].',ab='.$ini['multiposte']['baud'].',channels=2} --sout=#duplicate{dst=std{access=file,mux='.$ini['multiposte']['muxer'].',url="'.$fichier.'"}'."\n".$wwwstartbeg.'http://localhost:8080/lecteur/lunch_rec.php?id='.$id.$wwwstartend;
}elseif($ini['multiposte']['cvid']=='none' AND $ini['multiposte']['caud']=='none'){
- $link = 'start vlc\vlc.exe --wx-systray --intf=dummy --extraintf=http --http-src="'.realpath(realpath("../../").'/http-vlc').'" --http-host=:8082 --http-charset=ISO-8859-1 --quiet --dummy-quiet -vvv rtsp://mafreebox.freebox.fr/freeboxtv/'.$moreinfo.$chaine[2].' --sout=#duplicate{dst=std{access=file,mux='.$ini['multiposte']['muxer'].',url="'.$fichier.'"}
- start http://localhost:8080/lecteur/lunch_rec.php?id='.$id;
+ $link = $vlcstart.' '.$wxsystray.' --intf=dummy --extraintf=http --http-src="'.realpath(realpath("../../").'/http-vlc').'" --http-host=:8082 --http-charset=ISO-8859-1 --quiet '.$vlcdummyquiet.' -vvv rtsp://mafreebox.freebox.fr/freeboxtv/'.$moreinfo.$chaine[2].' --sout=#duplicate{dst=std{access=file,mux='.$ini['multiposte']['muxer'].',url="'.$fichier.'"}'."\n".$wwwstartbeg.'http://localhost:8080/lecteur/lunch_rec.php?id='.$id.$wwwstartend;
}elseif($ini['multiposte']['cvid']!='none' AND $ini['multiposte']['caud']=='none'){
- $link = 'start vlc\vlc.exe --wx-systray --intf=dummy --extraintf=http --http-src="'.realpath(realpath("../../").'/http-vlc').'" --http-host=:8082 --http-charset=ISO-8859-1 --quiet --dummy-quiet -vvv rtsp://mafreebox.freebox.fr/freeboxtv/'.$moreinfo.$chaine[2].' --sout=#transcode{vcodec='.$ini['multiposte']['cvid'].',vb='.$ini['multiposte']['bvid'].',scale=1} --sout=#duplicate{dst=std{access=file,mux='.$ini['multiposte']['muxer'].',url="'.$fichier.'"}
- start http://localhost:8080/lecteur/lunch_rec.php?id='.$id;
+ $link = $vlcstart.' '.$wxsystray.' --intf=dummy --extraintf=http --http-src="'.realpath(realpath("../../").'/http-vlc').'" --http-host=:8082 --http-charset=ISO-8859-1 --quiet '.$vlcdummyquiet.' -vvv rtsp://mafreebox.freebox.fr/freeboxtv/'.$moreinfo.$chaine[2].' --sout=#transcode{vcodec='.$ini['multiposte']['cvid'].',vb='.$ini['multiposte']['bvid'].',scale=1} --sout=#duplicate{dst=std{access=file,mux='.$ini['multiposte']['muxer'].',url="'.$fichier.'"}'."\n".$wwwstartbeg.'http://localhost:8080/lecteur/lunch_rec.php?id='.$id.$wwwstartend;
}elseif($ini['multiposte']['cvid']!='none' AND $ini['multiposte']['caud']=='none'){
- $link = 'start vlc\vlc.exe --wx-systray --intf=dummy --extraintf=http --http-src="'.realpath(realpath("../../").'/http-vlc').'" --http-host=:8082 --http-charset=ISO-8859-1 --quiet --dummy-quiet -vvv rtsp://mafreebox.freebox.fr/freeboxtv/'.$moreinfo.$chaine[2].' --sout=#transcode{acodec='.$ini['multiposte']['caud'].',ab='.$ini['multiposte']['baud'].',channels=2} --sout=#duplicate{dst=std{access=file,mux='.$ini['multiposte']['muxer'].',url="'.$fichier.'"}
- start http://localhost:8080/lecteur/lunch_rec.php?id='.$id;
- }
+ $link = $vlcstart.' '.$wxsystray.' --intf=dummy --extraintf=http --http-src="'.realpath(realpath("../../").'/http-vlc').'" --http-host=:8082 --http-charset=ISO-8859-1 --quiet '.$vlcdummyquiet.' -vvv rtsp://mafreebox.freebox.fr/freeboxtv/'.$moreinfo.$chaine[2].' --sout=#transcode{acodec='.$ini['multiposte']['caud'].',ab='.$ini['multiposte']['baud'].',channels=2} --sout=#duplicate{dst=std{access=file,mux='.$ini['multiposte']['muxer'].',url="'.$fichier.'"}'."\n".$wwwstartbeg.'http://localhost:8080/lecteur/lunch_rec.php?id='.$id.$wwwstartend;
+ }
- $variable = 'SET vlcpath="'.realpath("../../../").'"
+ if (PHP_OS == "WIN32" || PHP_OS == "WINNT") {
+ $variable = 'SET vlcpath="'.realpath("../../../").'"
CD %vlcpath%
'.$link.'
exit';
-
- $fp = fopen(realpath($USER).'\\'.$fichierbat,"a+");
+ } else {
+ $variable = 'vlcpath="'.realpath("../../")."\"\ncd \$vlcpath\n".$link."\nexit\n";
+ }
+
+ // Le double slash est DOS specifique, or DOS comprend sans probleme le slash
+ $fp = fopen(realpath($USER).'/'.$fichierbat,"a+");
fputs($fp,$variable);
fclose($fp);
//Cr\xE9ation du fichier bat de fermeture
- $link2 = 'start http://localhost:8080/lecteur/stop_rec.php?id='.$id;
- $variable = 'SET vlcpath="'.realpath("../../../").'"
+ $link2 = $wwwstartbeg.'http://localhost:8080/lecteur/stop_rec.php?id='.$id.$wwwstartend;
+ if (PHP_OS == "WIN32" || PHP_OS == "WINNT") {
+ $variable = 'SET vlcpath="'.realpath("../../../").'"
CD %vlcpath%
'.$link2.'
exit';
+ } else {
+ $variable = 'vlcpath="'.realpath("../../../")."\"\ncd \$vlcpath\n".$link2."\nexit\n";
+ }
$fp = fopen($USER.$fichierbat2,"w+");
fputs($fp,$variable);
fclose($fp);
//Enregistrement des taches
- $output = exec('at '.date("H:i", $deb).' /interactive /next:'.date("d", $deb).' "'.realpath($USER.$fichierbat).'"');
- $output2 = exec('at '.date("H:i", $end).' /interactive /next:'.date("d", $end).' "'.realpath($USER.$fichierbat2).'"');
- $debut = 'ID = ';
- $fin = '';
- preg_match("/$debut(.{1,2})$fin/s", $output, $valeur);
- preg_match("/$debut(.{1,2})$fin/s", $output2, $valeur2);
+ if (PHP_OS == "WIN32" || PHP_OS == "WINNT") {
+ $output = exec('at '.date("H:i", $deb).' /interactive /next:'.date("d", $deb).' "'.realpath($USER.$fichierbat).'"');
+ $output2 = exec('at '.date("H:i", $end).' /interactive /next:'.date("d", $end).' "'.realpath($USER.$fichierbat2).'"');
+ $debut = 'ID = ';
+ $fin = '';
+ preg_match("/$debut(.{1,2})$fin/s", $output, $valeur);
+ preg_match("/$debut(.{1,2})$fin/s", $output2, $valeur2);
+ } else {
+ add_to_cron(realpath($USER.$fichierbat), $deb,
+ realpath($USER.$fichierbat2), $end);
+ // les valeurs n'ont ici plus d'importance
+ $valeur[1] = $valeur2[1] = 99999;
+ }
// Modification de end dans SQLite
$db = sqlite_open('../../_utilisateur/records.db', 0666);
@@ -164,7 +202,9 @@
/********************* A FAIRE ******************/
if( $Heures_OK){
// ATTENTION Vlc a des probl\xE8mes avec les accents lors de la cr\xE9ation du fichier --- Mais \xE7a marche avec la 0.8.6 !!!
- $fichier = realpath($ini[multiposte][multiposte]).'\\'.$chaine[1].' - '.date("d-m-y H\hi", $deb).'.mpg';
+
+ // Le double slash est DOS specifique, or DOS comprend sans probleme le slash
+ $fichier = realpath($ini[multiposte][multiposte]).'/'.$chaine[1].' - '.date("d-m-y H\hi", $deb).'.mpg';
$fichierbat = $chaine[1].' - '.date("d-m-y H\hi", $deb).'.bat';
$fichierbat2 = $chaine[1].' - '.date("d-m-y H\hi", $deb).'-end.bat';
@@ -182,42 +222,57 @@
//Profils d'encodage
if($ini[multiposte][cvid]!='none' AND $ini[multiposte][caud]!='none'){
- $link = 'start vlc\vlc.exe --wx-systray --intf=dummy --extraintf=http --http-src="'.realpath(realpath("../../").'/http-vlc').'" --http-host=:8082 --http-charset=ISO-8859-1 --quiet --dummy-quiet -vvv rtsp://mafreebox.freebox.fr/freeboxtv/'.$moreinfo.$chaine[2].' --sout=#transcode{vcodec='.$ini[multiposte][cvid].',vb='.$ini[multiposte][bvid].',scale=1,acodec='.$ini[multiposte][caud].',ab='.$ini[multiposte][baud].',channels=2} --sout=#duplicate{dst=std{access=file,mux='.$ini[multiposte][muxer].',url="'.$fichier.'"}
- start http://localhost:8080/lecteur/lunch_rec.php?id='.($row[0]+1);
+ $link = $vlcstart.' '.$wxsystray.' --intf=dummy --extraintf=http --http-src="'.realpath(realpath("../../").'/http-vlc').'" --http-host=:8082 --http-charset=ISO-8859-1 --quiet '.$vlcdummyquiet.' -vvv rtsp://mafreebox.freebox.fr/freeboxtv/'.$moreinfo.$chaine[2].' --sout=#transcode{vcodec='.$ini['multiposte']['cvid'].',vb='.$ini['multiposte']['bvid'].',scale=1,acodec='.$ini['multiposte']['caud'].',ab='.$ini['multiposte']['baud'].',channels=2} --sout=#duplicate{dst=std{access=file,mux='.$ini['multiposte']['muxer'].',url="'.$fichier.'"}'."\n".$wwwstartbeg.'http://localhost:8080/lecteur/lunch_rec.php?id='.($row[0]+1).$wwwstartend;
}elseif($ini[multiposte][cvid]=='none' AND $ini[multiposte][caud]=='none'){
- $link = 'start vlc\vlc.exe --wx-systray --intf=dummy --extraintf=http --http-src="'.realpath(realpath("../../").'/http-vlc').'" --http-host=:8082 --http-charset=ISO-8859-1 --quiet --dummy-quiet -vvv rtsp://mafreebox.freebox.fr/freeboxtv/'.$moreinfo.$chaine[2].' --sout=#duplicate{dst=std{access=file,mux='.$ini[multiposte][muxer].',url="'.$fichier.'"}
- start http://localhost:8080/lecteur/lunch_rec.php?id='.($row[0]+1);
+ $link = $vlcstart.' '.$wxsystray.' --intf=dummy --extraintf=http --http-src="'.realpath(realpath("../../").'/http-vlc').'" --http-host=:8082 --http-charset=ISO-8859-1 --quiet '.$vlcdummyquiet.' -vvv rtsp://mafreebox.freebox.fr/freeboxtv/'.$moreinfo.$chaine[2].' --sout=#duplicate{dst=std{access=file,mux='.$ini['multiposte']['muxer'].',url="'.$fichier.'"}'."\n".$wwwstartbeg.'http://localhost:8080/lecteur/lunch_rec.php?id='.($row[0]+1).$wwwstartend;
}elseif($ini[multiposte][cvid]!='none' AND $ini[multiposte][caud]=='none'){
- $link = 'start vlc\vlc.exe --wx-systray --intf=dummy --extraintf=http --http-src="'.realpath(realpath("../../").'/http-vlc').'" --http-host=:8082 --http-charset=ISO-8859-1 --quiet --dummy-quiet -vvv rtsp://mafreebox.freebox.fr/freeboxtv/'.$moreinfo.$chaine[2].' --sout=#transcode{vcodec='.$ini[multiposte][cvid].',vb='.$ini[multiposte][bvid].',scale=1} --sout=#duplicate{dst=std{access=file,mux='.$ini[multiposte][muxer].',url="'.$fichier.'"}
- start http://localhost:8080/lecteur/lunch_rec.php?id='.($row[0]+1);
+ $link = $vlcstart.' '.$wxsystray.' --intf=dummy --extraintf=http --http-src="'.realpath(realpath("../../").'/http-vlc').'" --http-host=:8082 --http-charset=ISO-8859-1 --quiet '.$vlcdummyquiet.' -vvv rtsp://mafreebox.freebox.fr/freeboxtv/'.$moreinfo.$chaine[2].' --sout=#transcode{vcodec='.$ini['multiposte']['cvid'].',vb='.$ini['multiposte']['bvid'].',scale=1} --sout=#duplicate{dst=std{access=file,mux='.$ini['multiposte']['muxer'].',url="'.$fichier.'"}'."\n".$wwwstartbeg.'http://localhost:8080/lecteur/lunch_rec.php?id='.($row[0]+1).$wwwstartend;
}elseif($ini[multiposte][cvid]!='none' AND $ini[multiposte][caud]=='none'){
- $link = 'start vlc\vlc.exe --wx-systray --intf=dummy --extraintf=http --http-src="'.realpath(realpath("../../").'/http-vlc').'" --http-host=:8082 --http-charset=ISO-8859-1 --quiet --dummy-quiet -vvv rtsp://mafreebox.freebox.fr/freeboxtv/'.$moreinfo.$chaine[2].' --sout=#transcode{acodec='.$ini[multiposte][caud].',ab='.$ini[multiposte][baud].',channels=2} --sout=#duplicate{dst=std{access=file,mux='.$ini[multiposte][muxer].',url="'.$fichier.'"}
- start http://localhost:8080/lecteur/lunch_rec.php?id='.($row[0]+1);
- }
+ $link = $vlcstart.' '.$wxsystray.' --intf=dummy --extraintf=http --http-src="'.realpath(realpath("../../").'/http-vlc').'" --http-host=:8082 --http-charset=ISO-8859-1 --quiet '.$vlcdummyquiet.' -vvv rtsp://mafreebox.freebox.fr/freeboxtv/'.$moreinfo.$chaine[2].' --sout=#transcode{acodec='.$ini['multiposte']['caud'].',ab='.$ini['multiposte']['baud'].',channels=2} --sout=#duplicate{dst=std{access=file,mux='.$ini['multiposte']['muxer'].',url="'.$fichier.'"}'."\n".$wwwstartbeg.'http://localhost:8080/lecteur/lunch_rec.php?id='.($row[0]+1).$wwwstartend;
+ }
- $variable = 'SET vlcpath="'.realpath("../../../").'"
+ if (PHP_OS == "WIN32" || PHP_OS == "WINNT") {
+ $variable = 'SET vlcpath="'.realpath("../../../").'"
CD %vlcpath%
'.$link.'
exit';
-
- $fp = fopen(realpath($USER).'\\'.$fichierbat,"a+");
+ } else {
+ // Support eventuel de /etc/cron.d
+ $variable = 'vlcpath="'.realpath("../../")."\"\ncd \$vlcpath\n".$link."\nexit\n";
+ }
+
+ // Le double slash est DOS specifique, or DOS comprend sans probleme le slash
+ $fp = fopen(realpath($USER).'/'.$fichierbat,"a+");
fputs($fp,$variable);
fclose($fp);
//Cr\xE9ation du fichier bat de fermeture
- $link2 = 'start http://localhost:8080/lecteur/stop_rec.php?id='.($row[0]+1);
- $variable = 'SET vlcpath="'.realpath("../../../").'"
+ $link2 = $wwwstartbeg.'http://localhost:8080/lecteur/stop_rec.php?id='.($row[0]+1).$wwwstartend;
+ if (PHP_OS == "WIN32" || PHP_OS == "WINNT") {
+ $variable = 'SET vlcpath="'.realpath("../../../").'"
CD %vlcpath%
'.$link2.'
exit';
+ } else {
+ // Support eventuel de /etc/cron.d
+ $variable = 'vlcpath="'.realpath("../../")."\"\ncd \$vlcpath\n".$link2."\nexit\n";
+ }
$fp = fopen($USER.$fichierbat2,"w+");
fputs($fp,$variable);
fclose($fp);
//Enregistrement des taches
- $output = exec('at '.date("H:i", $deb).' /interactive /next:'.date("d", $deb).' "'.realpath($USER.$fichierbat).'"');
- $output2 = exec('at '.date("H:i", $end).' /interactive /next:'.date("d", $end).' "'.realpath($USER.$fichierbat2).'"');
+ if (PHP_OS == "WIN32" || PHP_OS == "WINNT") {
+ $output = exec('at '.date("H:i", $deb).' /interactive /next:'.date("d", $deb).' "'.realpath($USER.$fichierbat).'"');
+ $output2 = exec('at '.date("H:i", $end).' /interactive /next:'.date("d", $end).' "'.realpath($USER.$fichierbat2).'"');
+ } else {
+ // Support eventuel de /etc/cron.d
+ add_to_cron(realpath($USER.$fichierbat), $deb,
+ realpath($USER.$fichierbat2), $end);
+ // Ici les output n'ont plus d'importance
+ $output = $output2 = "Et voila";
+ }
//if(eregi("T\x83che ajout\x82e",$output)){ // Probl\xE8me d'encodage des accents dans le fichier !!
if(isset($output)){ // Ce test n'est pas bon test !!!
@@ -226,10 +281,33 @@
$msg .= 'Sur '.$chaine[1].' le '.date("d/m/y H:i", $deb);
}
- $debut = 'ID = ';
- $fin = '';
- preg_match("/$debut(.{1,2})$fin/s", $output, $valeur);
- preg_match("/$debut(.{1,2})$fin/s", $output2, $valeur2);
+ if (PHP_OS == "WIN32" || PHP_OS == "WINNT") {
+ $debut = 'ID = ';
+ $fin = '';
+ preg_match("/$debut(.{1,2})$fin/s", $output, $valeur);
+ preg_match("/$debut(.{1,2})$fin/s", $output2, $valeur2);
+ } else {
+ // On devrait utiliser une table avec un auto increment
+ $db = sqlite_open('../../_utilisateur/records.db', 0666);
+ $requete='SELECT COUNT(*) AS currentrecords FROM records';
+ $result = sqlite_query($db,$requete);
+ $row = sqlite_fetch_array($result);
+ sqlite_close($db);
+ if ($row['currentrecords'] == 0) {
+ // Table vide
+ $valeur[1] = 1;
+ } else {
+ // Je sais, ca n'est pas atomique
+ // A ameliorer
+ $db = sqlite_open('../../_utilisateur/records.db', 0666);
+ $requete='SELECT MAX(id) AS maxid FROM records';
+ $result = sqlite_query($db,$requete);
+ $row = sqlite_fetch_array($result);
+ $valeur[1] = $row['maxid'];
+ sqlite_close($db);
+ }
+ $valeur2[1] = $valeur[1]+1;
+ }
sqlite_query($db,'INSERT INTO records VALUES ("'.($row[0]+1).'","'.$_GET['chaine'].'","'.$deb.'","'.$end.'","'.realpath($USER.$fichierbat).'","'.$valeur[1].'","'.$valeur2[1].'","En attente")');
}
Modified: trunk/module/multiposte/index1.php
===================================================================
--- trunk/module/multiposte/index1.php 2007-05-13 20:26:26 UTC (rev 150)
+++ trunk/module/multiposte/index1.php 2007-05-13 20:26:51 UTC (rev 151)
@@ -35,12 +35,20 @@
$requete='SELECT * from records WHERE id='.$_GET['id'];
$result = sqlite_query($db,$requete);
$result = sqlite_fetch_array($result);
- $at=shell_exec('at');
- if(eregi(addslashes($result['fichierbat']),$at))
- {
- $at=exec('at '.$result['task'].' /delete');
- $at.=exec('at '.$result['taskend'].' /delete');
- }
+ if (PHP_OS == "WIN32" || PHP_OS == "WINNT") {
+ $at=shell_exec('at');
+ if(eregi(addslashes($result['fichierbat']),$at))
+ {
+ $at=exec('at '.$result['task'].' /delete');
+ $at.=exec('at '.$result['taskend'].' /delete');
+ }
+ } else {
+ // Support eventuel de /etc/cron.d
+ $string1 = $result['fichierbat'];
+ $string2 = ereg_replace(".bat","-end.bat",$string1);
+ remove_from_cron($string1);
+ remove_from_cron($string2);
+ }
@unlink($result['fichierbat']);
@unlink(ereg_replace(".bat","-end.bat",$result['fichierbat']));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gu...@us...> - 2007-05-13 20:26:28
|
Revision: 150
http://svn.sourceforge.net/easybox-mod/?rev=150&view=rev
Author: guyou
Date: 2007-05-13 13:26:26 -0700 (Sun, 13 May 2007)
Log Message:
-----------
Gestion cron
Ajout de fonctions pour manipuler le fichier cron.
Modified Paths:
--------------
trunk/_framework/fonctions_partagees.inc.php
Modified: trunk/_framework/fonctions_partagees.inc.php
===================================================================
--- trunk/_framework/fonctions_partagees.inc.php 2007-05-12 14:42:31 UTC (rev 149)
+++ trunk/_framework/fonctions_partagees.inc.php 2007-05-13 20:26:26 UTC (rev 150)
@@ -15,6 +15,68 @@
save_variable('current_type',$type);
}
+function remove_from_cron($chaine) {
+
+ $cron = '/etc/cron.d/easybox';
+
+ // Par souci de protection on s'assure qu'on n'est pas appele
+ // sur une platfeforme windows
+ if (! (PHP_OS == "WIN32" || PHP_OS == "WINNT")) {
+ // extra protection
+ if (is_writable($cron)) {
+ // On recherche les lignes qui appellent la chaine
+ if ($fp = @fopen($cron,"r+")) {
+ $status=1;
+ $nok=0;
+ $newbuffer = '';
+ while (! feof($fp)) {
+ if ($buffer = @fgets($fp, 4096)) {
+ if (strlen($buffer) > 0) {
+ if (! strstr($buffer, $chaine)) {
+ if ($nok++ == 0) {
+ $newbuffer = $buffer;
+ } else {
+ $newbuffer .= $buffer;
+ }
+ }
+ }
+ } else {
+ $status=0;
+ break;
+ }
+ }
+ if ($status == 0) {
+ if (@rewind($fp)) {
+ if (@fwrite($fp, $newbuffer)) {
+ @ftruncate($fp, strlen($newbuffer));
+ }
+ }
+ }
+ @fclose($fp);
+ }
+ }
+ }
+}
+
+function add_to_cron($fichier1, $deb, $fichier2, $end) {
+ $cron = '/etc/cron.d/easybox';
+
+ // Par souci de protection on s'assure qu'on n'est pas appele
+ // sur une platfeforme windows
+ if (! (PHP_OS == "WIN32" || PHP_OS == "WINNT")) {
+ // extra protection
+ if (is_writable($cron)) {
+
+ if ($fp = @fopen('/etc/cron.d/easybox',"a+")) {
+ @fputs($fp, date("i", $deb).' '.date("H", $deb).' '.date("j", $deb).' '.date("n", $deb)." * www-data /bin/sh '".$fichier1."'\n");
+ @fputs($fp, date("i", $end).' '.date("H", $end).' '.date("j", $end).' '.date("n", $end)." * www-data /bin/sh '".$fichier2."'\n");
+ @fclose($fp);
+ }
+ }
+ }
+}
+
+
function supprime_accents($chaine) {
$a = "\xE0\xE1\xE2\xE3\xE4\xE5\xF2\xF3\xF4\xF5\xF6\xF8\xE8\xE9\xEA\xEB\xE7\xEC\xED\xEE\xEF\xF9\xFA\xFB\xFC\xFF\xF1";
$b = "aaaaaaooooooeeeeciiiiuuuuyn";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gu...@us...> - 2007-05-12 14:42:32
|
Revision: 149
http://svn.sourceforge.net/easybox-mod/?rev=149&view=rev
Author: guyou
Date: 2007-05-12 07:42:31 -0700 (Sat, 12 May 2007)
Log Message:
-----------
arret d'un enregistrement en cours
(patch Jdd)
Modified Paths:
--------------
trunk/module/multiposte/index1.php
Modified: trunk/module/multiposte/index1.php
===================================================================
--- trunk/module/multiposte/index1.php 2007-05-11 21:47:23 UTC (rev 148)
+++ trunk/module/multiposte/index1.php 2007-05-12 14:42:31 UTC (rev 149)
@@ -23,7 +23,7 @@
$smarty->assign('AVERTISSEMENT',"Enregistrement interrompu");
$smarty->display('avertissement.tpl');
}else{
- $smarty->assign('AVERTISSEMENT','Vous allez supprimer un enregistrement en cours. L\'enregistrement sera interrompu mais la partie d\xE9j\xE0 enregistr\xE9e sera conserv\xE9e. Voulez-vous confirmer ?<br> <br><a href="index1.php?module=suppr&valide=1">Oui</a> - <a href="index1.php">Non</a>');
+ $smarty->assign('AVERTISSEMENT','Vous allez supprimer un enregistrement en cours. L\'enregistrement sera interrompu mais la partie d\xE9j\xE0 enregistr\xE9e sera conserv\xE9e. Voulez-vous confirmer ?<br> <br><a href="index1.php?module=suppr&id='.$_GET['id'].'&valide=1">Oui</a> - <a href="index1.php">Non</a>');
$smarty->display('avertissement.tpl');
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gu...@us...> - 2007-05-11 21:47:25
|
Revision: 148
http://svn.sourceforge.net/easybox-mod/?rev=148&view=rev
Author: guyou
Date: 2007-05-11 14:47:23 -0700 (Fri, 11 May 2007)
Log Message:
-----------
Support des partitions via /etc/fstab
Easybox, au d?\195?\169marrage, scanne les disques et
cherche a d?\195?\169terminer en particulier quels sont
les disques optiques.
Modified Paths:
--------------
trunk/_framework/demarrage.php
trunk/_framework/fonctions_partagees.inc.php
trunk/_framework/framework.php
Added Paths:
-----------
trunk/_framework/lib/File_Fstab-2.0.2/
trunk/_framework/lib/File_Fstab-2.0.2/Entry.php
trunk/_framework/lib/File_Fstab-2.0.2/Fstab.php
Modified: trunk/_framework/demarrage.php
===================================================================
--- trunk/_framework/demarrage.php 2007-05-08 23:08:11 UTC (rev 147)
+++ trunk/_framework/demarrage.php 2007-05-11 21:47:23 UTC (rev 148)
@@ -82,7 +82,7 @@
clean_vars();
// R\xE9cup\xE9ration des disques
- if (PHP_OS == "WIN32" || PHP_OS == "WINNT") {
+ if (PHP_OS == "WIN32" || PHP_OS == "WINNT" || is_readable('/etc/fstab')) {
save_variable('disques', serialize(DISQUES()));
}
Modified: trunk/_framework/fonctions_partagees.inc.php
===================================================================
--- trunk/_framework/fonctions_partagees.inc.php 2007-05-08 23:08:11 UTC (rev 147)
+++ trunk/_framework/fonctions_partagees.inc.php 2007-05-11 21:47:23 UTC (rev 148)
@@ -242,6 +242,30 @@
$obj = null;
}
+ } elseif (is_readable('/etc/fstab')) {
+ // si ce fichier est lisible on assume qu'on est sur un OS qui le supporte
+ // Noter que c'est une facon pour un autre OS que Linux ou Windows de faire
+ // en sorte que easybox puisse acc\xE9der aux disques!
+
+ $fstab =& new File_Fstab();
+ foreach($fstab->entries as $io) {
+ // On n'a pas la description hardware du type de disque,
+ // mais on sait qu'un CD-ROM ou un DVD sont pratiquement
+ // toujours de type cd9660 pour mac, udf ou iso9660
+ // A priori on pourrait ajouter 'auto' dans les types accept\xE9s,
+ // mais en pratique ca revient a rajouter une entr\xE9e pour
+ // le... lecteur de disquettes.
+ if (strstr($io->getFsType(),'udf') || strstr($io->getFsType(),'iso9660') || strstr($io->getFsType(),'cd9660')) {
+ $lect[] = array('lettre'=>$io->getDevice(), 'path'=>$io->getMountPoint(), 'type'=>'Disque optique', 'nom'=>$io->getMountPoint(), 'gif'=>'diskoptical');
+ } elseif (! strstr($io->getFsType(),'proc')) {
+ // Bon, on se souviens quand-meme des autres, sauf /proc car faut pas pousser
+ $lect[] = array('lettre'=>$io->getDevice(), 'path'=>$io->getMountPoint(), 'type'=>'Inconnu', 'nom'=>$io->getMountPoint(), 'gif'=>'diskunknown');
+ }
+ }
+
+ // On ajoute le bouton de rafraichissement
+ $lect[] = array('lettre'=>'Rafra\xEEchir', 'path'=>'reload', 'type'=>'fonction', 'nom'=>'Recharger', 'gif'=>'reload');
+
}
//print_r($lect);
RETURN($lect);
Modified: trunk/_framework/framework.php
===================================================================
--- trunk/_framework/framework.php 2007-05-08 23:08:11 UTC (rev 147)
+++ trunk/_framework/framework.php 2007-05-11 21:47:23 UTC (rev 148)
@@ -72,6 +72,11 @@
//-- Librairie pour r\xE9cup\xE9rer des infos sur des fichiers depuis allocine ou autre...
require_once($LIBRARIES_REP.'get_info.php');
+//-- Librairie pour g\xE9rer /etc/fstab (PEAR)
+ require_once($LIBRARIES_REP.'File_Fstab-2.0.2/Entry.php');
+ require_once($LIBRARIES_REP.'File_Fstab-2.0.2/Fstab.php');
+
+
//--Libraire de gestion du fichier ini
require_once($LIBRARIES_REP.'ini.php');
Added: trunk/_framework/lib/File_Fstab-2.0.2/Entry.php
===================================================================
--- trunk/_framework/lib/File_Fstab-2.0.2/Entry.php (rev 0)
+++ trunk/_framework/lib/File_Fstab-2.0.2/Entry.php 2007-05-11 21:47:23 UTC (rev 148)
@@ -0,0 +1,552 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+
+/**
+ * This file contains the class for an entry in a fstab file
+ *
+ * PHP versions 4 and 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt. If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to li...@ph... so we can mail you a copy immediately.
+ *
+ * @category File Formats
+ * @package File_Fstab
+ * @author Ian Eure <ie...@ph...>
+ * @copyright (c) 2004, 2005 Ian Eure
+ * @license http://www.php.net/license/3_0.txt PHP License 3.0
+ * @version Release: @package_version@
+ * @version CVS: $Revision: 1.7 $
+ * @link http://pear.php.net/package/File_Fstab
+ */
+
+
+/**
+ * These defines enumerate the possible types of device entries in the fstab
+ */
+define('FILE_FSTAB_ENTRY_DEVTYPE_BLOCKDEV', 1);
+define('FILE_FSTAB_ENTRY_DEVTYPE_UUID', 2);
+define('FILE_FSTAB_ENTRY_DEVTYPE_LABEL', 3);
+
+
+/**
+ * A single entry in a fstab file
+ *
+ * @category File Formats
+ * @package File_Fstab
+ * @author Ian Eure <ie...@ph...>
+ * @copyright (c) 2004, 2005 Ian Eure
+ * @license http://www.php.net/license/3_0.txt PHP License 3.0
+ * @version Release: @package_version@
+ * @version CVS: $Revision: 1.7 $
+ * @link http://pear.php.net/package/File_Fstab
+ */
+class File_Fstab_Entry {
+ /**
+ * Raw line from fstab
+ *
+ * @var string
+ */
+ var $entry;
+
+ /**
+ * Block device
+ *
+ * Only one of $device, $uuid, or $label will be set, based on what's in the
+ * fstab entry.
+ *
+ * @var string
+ */
+ var $device = '/dev/null';
+
+ /**
+ * Device UUID
+ *
+ * Only one of $device, $uuid, or $label will be set, based on what's in the
+ * fstab entry.
+ *
+ * @var string
+ */
+ var $uuid;
+
+ /**
+ * Device label
+ *
+ * Only one of $device, $uuid, or $label will be set, based on what's in the
+ * fstab entry.
+ *
+ * @var string
+ */
+ var $label;
+
+ /**
+ * Device mount point
+ *
+ * @var string
+ */
+ var $mountPoint = '/mnt';
+
+ /**
+ * Device filesystem type
+ *
+ * @var string
+ */
+ var $fsType = 'auto';
+
+ /**
+ * Mount options
+ *
+ * @var array
+ */
+ var $mountOptions = array(
+ 'defaults' => "defaults"
+ );
+
+ /**
+ * Device dump frequency
+ *
+ * @var int
+ */
+ var $dumpFrequency = 0;
+
+ /**
+ * Device fsck pass number
+ *
+ * @var int
+ */
+ var $fsckPassNo = 0;
+
+ /**
+ * Have we parsed the entry?
+ *
+ * @var boolean
+ * @access private
+ */
+ var $_haveParsed = false;
+
+
+ /**
+ * Constructor
+ *
+ * @param string $entry Single entry from fstab file
+ * @return void
+ */
+ function File_Fstab_Entry($entry = false)
+ {
+ if ($entry) {
+ $this->setEntry($entry);
+ $this->parse();
+ }
+ }
+
+ /**
+ * Set block device
+ *
+ * Only one of device, uuid, or label may be set; setting this will un-set
+ * any valies in the other variables.
+ *
+ * @since 2.0.0beta1
+ * @param string $device Value to set
+ * @return mixed boolean true on success, PEAR_Error otherwise
+ */
+ function setDevice($device)
+ {
+ $this->device = $device;
+ unset($this->uuid, $this->label);
+ return true;
+ }
+
+ /**
+ * Get block device
+ *
+ * @since 2.0.0beta1
+ * @return string
+ */
+ function getDevice()
+ {
+ return $this->device;
+ }
+
+ /**
+ * Set UUID
+ *
+ * Only one of device, uuid, or label may be set; setting this will un-set
+ * any valies in the other variables.
+ *
+ * @since 2.0.0beta1
+ * @param string $uuid Value to set
+ * @return mixed boolean true on success, PEAR_Error otherwise
+ */
+ function setUUID($uuid)
+ {
+ $this->uuid = $uuid;
+ unset($this->device, $this->label);
+ return true;
+ }
+
+ /**
+ * Get UUID
+ *
+ * @since 2.0.0beta1
+ * @return string
+ */
+ function getUUID()
+ {
+ return $this->uuid;
+ }
+
+ /**
+ * Set device label
+ *
+ * Only one of device, uuid, or label may be set; setting this will un-set
+ * any valies in the other variables.
+ *
+ * @since 2.0.0beta1
+ * @param string $label Value to set
+ * @return mixed boolean true on success, PEAR_Error otherwise
+ */
+ function setLabel($label)
+ {
+ $this->label = $label;
+ unset($this->device, $this->uuid);
+ return true;
+ }
+
+ /**
+ * Get device label
+ *
+ * @since 2.0.0beta1
+ * @return string
+ */
+ function getLabel()
+ {
+ return $this->label;
+ }
+
+ /**
+ * Set mount point
+ *
+ * @since 2.0.0beta1
+ * @param string $dir Value to set
+ * @return mixed boolean true on success, PEAR_Error otherwise
+ */
+ function setMountPoint($dir)
+ {
+ $this->mountPoint = $dir;
+ return true;
+ }
+
+ /**
+ * Get mount point
+ *
+ * @since 2.0.0beta1
+ * @return string
+ */
+ function getMountPoint()
+ {
+ return $this->mountPoint;
+ }
+
+ /**
+ * Set filesystem type
+ *
+ * @since 2.0.0beta1
+ * @param string $type Value to set
+ * @return mixed boolean true on success, PEAR_Error otherwise
+ */
+ function setFsType($type)
+ {
+ $this->fsType = $type;
+ return true;
+ }
+
+ /**
+ * Get filesystem type
+ *
+ * @since 2.0.0beta1
+ * @return string
+ */
+ function getFsType()
+ {
+ return $this->fsType;
+ }
+
+ /**
+ * Set filesystem dump frequency
+ *
+ * @since 2.0.0beta1
+ * @param int $type Value to set
+ * @return mixed boolean true on success, PEAR_Error otherwise
+ */
+ function setDumpFrequency($freq)
+ {
+ $this->dumpFrequency = $freq;
+ return true;
+ }
+
+ /**
+ * Get filesystem dump frequency
+ *
+ * @since 2.0.0beta1
+ * @return int
+ */
+ function getDumpFrequency()
+ {
+ return $this->dumpFrequency;
+ }
+
+ /**
+ * Set filesystem fsck pass number
+ *
+ * @since 2.0.0beta1
+ * @param int $type Value to set
+ * @return mixed boolean true on success, PEAR_Error otherwise
+ */
+ function setFsckPassNo($pass)
+ {
+ $this->fsckPassNo = $pass;
+ return true;
+ }
+
+ /**
+ * Get filesystem fsck pass number
+ *
+ * @since 2.0.0beta1
+ * @return int
+ */
+ function getFsckPassNo()
+ {
+ return $this->fsckPassNo;
+ }
+
+ /**
+ * Set an entry
+ *
+ * @param string $entry Single entry from fstab file
+ * @return void
+ */
+ function setEntry($entry)
+ {
+ $this->entry = $entry;
+ $this->_haveParsed = false;
+ }
+
+ /**
+ * Parse fstab entry
+ *
+ * @param string $entry Line from fstab to parse
+ * @return mixed true on success, PEAR_Error on failure
+ */
+ function parse()
+ {
+ if ($this->_haveParsed || !strlen($this->entry)) {
+ return true;
+ }
+
+ // Sanitize.
+ $this->_cleanup();
+
+ // It might be a good idea to allow specifying a custom whitespace
+ // character list.
+ $sections = split("\ +|\t+", $this->entry);
+ if (count($sections) != 6) {
+ return false;
+ }
+
+ list($device, $this->mountPoint, $this->fsType, $options, $this->dumpFrequency, $this->fsckPassNo) = $sections;
+
+ // Device, UUID, or Label?
+ switch (substr($device, 0, 4)) {
+ case 'UUID':
+ list($null, $this->uuid) = explode('=', $device);
+ break;
+
+ case 'LABE':
+ list($null, $this->label) = explode('=', $device);
+ break;
+
+ default:
+ $this->device = $device;
+ }
+
+ $this->_parseMountOptions($options);
+
+ $this->_haveParsed = true;
+ return true;
+ }
+
+ /**
+ * Clean up prior to parsing
+ *
+ * @access private
+ * @return void
+ */
+ function _cleanup()
+ {
+ $this->mountOptions = array();
+ unset($this->device, $this->uuid, $this->label, $this->mountPoint,
+ $this->fsType, $this->dumpFrequency, $this->fsckPassNo);
+ }
+
+ /**
+ * Parse fstab options
+ *
+ * @param $options string Mount options from fstab
+ *
+ * @return void
+ * @access protected
+ */
+ function _parseMountOptions($options)
+ {
+ foreach (explode(',', $options) as $option) {
+ if (strstr($option, '=')) {
+ $tmp = explode('=', $option);
+ list($name, $value) = $tmp;
+ } else {
+ $name = $option;
+ $value = $option;
+ }
+ $this->mountOptions[$name] = $value;
+ }
+ }
+
+ /**
+ * Reconstruct fstab options from $mountOptions
+ *
+ * @return string fstab mount options
+ * @access protected
+ */
+ function _makeMountOptions()
+ {
+ // Copy.
+ foreach ($this->mountOptions as $option => $value) {
+ if ($option == $value) {
+ $opts[] = $option;
+ } else {
+ $opts[] = $option.'='.$value;
+ }
+ }
+ return implode(',', $opts);
+ }
+
+ /**
+ * Get the fstab entry
+ *
+ * This rebuilds the entry from the class variables.
+ *
+ * @return string The fstab entry
+ */
+ function getEntry($seperator)
+ {
+ $entry = array(
+ $this->_getDeviceEntry(),
+ $this->getMountPoint(),
+ $this->getFsType(),
+ $this->_makeMountOptions(),
+ $this->getDumpFrequency(),
+ $this->getFsckPassNo()
+ );
+ return implode($entry, $seperator);
+ }
+
+ /**
+ * Get device, or uuid, or label
+ *
+ * @return string Device/UUID/LABEL
+ */
+ function getDeviceUUIDOrLabel()
+ {
+ if ($this->device) {
+ return $this->getDevice();
+ } else if ($this->uuid) {
+ return $this->getUUID();
+ } else if($this->label) {
+ return $this->getLabel();
+ }
+ }
+
+ /**
+ * Get device entry for building fstab
+ *
+ * This is like getDeviceUUIDOrLabel(), but we prefix the actual value
+ * with the necessary string for it to work in the fstab.
+ *
+ * @return string Device/UUID/LABEL
+ * @access protected
+ */
+ function _getDeviceEntry()
+ {
+ switch ($this->getDeviceType()) {
+ case FILE_FSTAB_ENTRY_DEVTYPE_UUID:
+ $prefix = 'UUID=';
+ break;
+
+ case FILE_FSTAB_ENTRY_DEVTYPE_LABEL:
+ $prefix = 'LABEL=';
+ break;
+
+ default:
+ $prefix = '';
+ }
+ return $prefix.$this->getDeviceUUIDOrLabel();
+ }
+
+ /**
+ * Get device type
+ *
+ * @return int One of FILE_FSTAB_ENTRY_DEVTYPE_BLOCKDEV, _UUID, or _LABEL
+ */
+ function getDeviceType()
+ {
+ if ($this->device) {
+ return FILE_FSTAB_ENTRY_DEVTYPE_BLOCKDEV;
+ } else if ($this->uuid) {
+ return FILE_FSTAB_ENTRY_DEVTYPE_UUID;
+ } else if ($this->label) {
+ return FILE_FSTAB_ENTRY_DEVTYPE_LABEL;
+ }
+ }
+
+ /**
+ * Is an option set?
+ *
+ * @param string $option Option name
+ * @return boolean
+ */
+ function hasMountOption($option)
+ {
+ return @array_key_exists($option, $this->mountOptions);
+ }
+
+ /**
+ * Get a mount option
+ *
+ * @param string $which Option to get
+ * @return string Mount option
+ */
+ function getMountOption($which)
+ {
+ if (!$this->hasMountOption($which)) {
+ return false;
+ }
+ return $this->mountOptions[$which];
+ }
+
+ /**
+ * Set a mount option
+ *
+ * @param string $name Option to set
+ * @param string $value Value to give option, or blank if option takes no args
+ * @return void
+ */
+ function setMountOption($name, $value = false)
+ {
+ if (!$value) {
+ $value = $name;
+ }
+ $this->mountOptions[$name] = $value;
+ }
+}
+?>
Added: trunk/_framework/lib/File_Fstab-2.0.2/Fstab.php
===================================================================
--- trunk/_framework/lib/File_Fstab-2.0.2/Fstab.php (rev 0)
+++ trunk/_framework/lib/File_Fstab-2.0.2/Fstab.php 2007-05-11 21:47:23 UTC (rev 148)
@@ -0,0 +1,297 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+
+/**
+ * Main File_Fstab file
+ *
+ * PHP versions 4 and 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt. If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to li...@ph... so we can mail you a copy immediately.
+ *
+ * @category File Formats
+ * @package File_Fstab
+ * @author Ian Eure <ie...@ph...>
+ * @copyright (c) 2004, 2005 Ian Eure
+ * @license http://www.php.net/license/3_0.txt PHP License 3.0
+ * @version Release: @package_version@
+ * @version CVS: $Revision: 1.11 $
+ * @link http://pear.php.net/package/File_Fstab
+ */
+
+/**
+ * These defines enumerate the possible error types
+ */
+define('FILE_FSTAB_ERROR_NOENT', -1);
+define('FILE_FSTAB_PERMISSION_DENIED', -2);
+define('FILE_FSTAB_WRONG_CLASS', -3);
+
+/**
+ * Class to read, write, and manipulate fstab files
+ *
+ * @category File Formats
+ * @package File_Fstab
+ * @author Ian Eure <ie...@ph...>
+ * @copyright (c) 2004, 2005 Ian Eure
+ * @license http://www.php.net/license/3_0.txt PHP License 3.0
+ * @version Release: @package_version@
+ * @version CVS: $Revision: 1.11 $
+ * @link http://pear.php.net/package/File_Fstab
+ */
+class File_Fstab {
+ /**
+ * Array of fstab entries
+ *
+ * @var array
+ */
+ var $entries = array();
+
+ /**
+ * Class options.
+ *
+ * @var array
+ */
+ var $options = array();
+
+ /**
+ * Default options
+ *
+ * @var array
+ * @access private
+ */
+ var $_defaultOptions = array(
+ 'entryClass' => "File_Fstab_Entry",
+ 'file' => "/etc/fstab",
+ 'fieldSeperator' => "\t"
+ );
+
+ /**
+ * Has the fstab been parsed?
+ *
+ * @var boolean
+ * @access private
+ */
+ var $_isLoaded = false;
+
+ /**
+ * Constructor
+ *
+ * @param array $options Associative array of options to set
+ * @return void
+ */
+ function File_Fstab($options = false)
+ {
+ $this->setOptions($options);
+ if ($this->options['file']) {
+ $this->load();
+ }
+ }
+
+ /**
+ * Return a single instance to handle a fstab file
+ *
+ * @param string $fstab Path to the fstab file
+ * @return object File_Fstab instance
+ */
+ function &singleton($fstab)
+ {
+ static $instances;
+ if (!isset($instances)) {
+ $instances = array();
+ }
+
+ if (!isset($instances[$fstab])) {
+ $instances[$fstab] = &new File_Fstab(array('file' => $fstab));
+ }
+
+ return $instances[$fstab];
+ }
+
+ /**
+ * Parse fstab file
+ *
+ * @return void
+ * @since 1.0.1
+ */
+ function load()
+ {
+ $fp = fopen($this->options['file'], 'r');
+ while ($line = fgets($fp, 1024)) {
+
+ // Strip comments & trim whitespace
+ $line = trim(ereg_replace('#.*$', '', $line));
+
+ // Ignore blank lines
+ if (!strlen($line)) {
+ continue;
+ }
+
+ $class = $this->options['entryClass'];
+ $this->entries[] = new $class($line);
+
+ }
+
+ $this->_isLoaded = true;
+ }
+
+ /**
+ * Update entries
+ *
+ * This will dump all the entries and re-parse the fstab. There's probably
+ * a better way of doing this, like forcing the extant entries to re-parse,
+ * and adding/removing entries as needed, but I don't feel like doing that
+ * right now.
+ *
+ * @return void
+ */
+ function update()
+ {
+ unset($this->entries);
+ $this->load();
+ }
+
+ /**
+ * Get a File_Fstab_Entry object for a path
+ *
+ * @param string $path Mount point
+ * @return mixed File_Fstab_Entry instance on success, PEAR_Error otherwise
+ */
+ function &getEntryForPath($path)
+ {
+ foreach ($this->entries as $key => $entry) {
+ if ($entry->mountPoint == $path) {
+ // Foreach makes copies - make sure we return a reference
+ return $this->entries[$key];
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Get a File_Fstab_Entry object for a block device
+ *
+ * @param string $blockdev Block device
+ * @return mixed File_Fstab_Entry instance on success, PEAR_Error otherwise
+ */
+ function &getEntryForDevice($blockdev)
+ {
+ foreach ($this->entries as $key => $entry) {
+ if ($entry->getDeviceType() == FILE_FSTAB_ENTRY_DEVTYPE_BLOCKDEV &&
+ $entry->device == $blockdev) {
+ // Foreach makes copies - make sure we return a reference
+ return $this->entries[$key];
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Get a File_Fstab_Entry object for a UUID
+ *
+ * @param string $uuid UUID device
+ * @return mixed File_Fstab_Entry instance on success, PEAR_Error otherwise
+ */
+ function &getEntryForUUID($uuid)
+ {
+ foreach ($this->entries as $key => $entry) {
+ if ($entry->getDeviceType() == FILE_FSTAB_ENTRY_DEVTYPE_UUID &&
+ $entry->uuid == $uuid) {
+ // Foreach makes copies - make sure we return a reference
+ return $this->entries[$key];
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Get a File_Fstab_Entry object for a label
+ *
+ * @param string $label Label
+ * @return mixed File_Fstab_Entry instance on success, PEAR_Error otherwise
+ */
+ function &getEntryForLabel($label)
+ {
+ foreach ($this->entries as $key => $entry) {
+ if ($entry->getDeviceType() == FILE_FSTAB_ENTRY_DEVTYPE_LABEL &&
+ $entry->label == $label) {
+ // Foreach makes copies - make sure we return a reference
+ return $this->entries[$key];
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Add a new entry
+ *
+ * @param object $entry Reference to a File_Fstab_Entry-derived class
+ * @return mixed boolean true on success, PEAR_Error otherwise.
+ */
+ function addEntry(&$entry)
+ {
+ if (!is_a($entry, 'File_Fstab_Entry')) {
+ return false;
+ }
+
+ $this->entries[] = $entry;
+ return true;
+ }
+
+ /**
+ * Set class options
+ *
+ * The allowed options are:
+ *
+ * - entryClass
+ * Class to use for entries in the fstab. Defaults to File_Fstab_Entry.
+ * you can use this to provide your own entry class with added
+ * functionality. This class must extend File_Fstab_Entry.
+ *
+ * - file
+ * File to parse. Defaults to /etc/fstab.
+ *
+ * - fieldSeparator
+ * Separator for fields. This only affects the output when you call
+ * {@link save()}. This text is placed in between the elements of the
+ * fstab entry line.
+ *
+ * @param array $options Associative array of options to set
+ * @return void
+ */
+ function setOptions($options = false)
+ {
+ if (!is_array($options)) {
+ $options = array();
+ }
+
+ $this->options = array_merge($this->_defaultOptions, $options);
+ }
+
+ /**
+ * Write out a modified fstab
+ *
+ * WARNING: This will strip comments and blank lines from the original fstab.
+ *
+ * @return mixed true on success, PEAR_Error on failure
+ * @since 1.0.1
+ */
+ function save($output = false)
+ {
+ $output = $output ? $output : $this->options['file'];
+
+ $fp = @fopen($output, 'w');
+ if (!$fp) {
+ return false;
+ }
+
+ foreach($this->entries as $entry) {
+ fwrite($fp, $entry->getEntry($this->options['fieldSeperator'])."\n");
+ }
+ fclose($fp);
+ return true;
+ }
+}
+?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cra...@us...> - 2007-05-08 23:08:13
|
Revision: 147
http://svn.sourceforge.net/easybox-mod/?rev=147&view=rev
Author: craftsnux
Date: 2007-05-08 16:08:11 -0700 (Tue, 08 May 2007)
Log Message:
-----------
correction probleme menu tournant avec freebox 4
Modified Paths:
--------------
trunk/skin/mediacenter/menu.tpl
Modified: trunk/skin/mediacenter/menu.tpl
===================================================================
--- trunk/skin/mediacenter/menu.tpl 2007-05-08 13:35:18 UTC (rev 146)
+++ trunk/skin/mediacenter/menu.tpl 2007-05-08 23:08:11 UTC (rev 147)
@@ -8,19 +8,19 @@
{section name=menu loop=$MENU}
{if $CAT=="1" AND NOT $SHOW}
{if $smarty.section.menu.first}
- <a focused onfocus='front_panel="FILMS";service="ts://127.0.0.1?bidule=0&ox=0&oy=0&ow=720&oh=576,&ix=0&iy=0&iw=360&ih=192";' href="../../module/films/index1.php">
+ <a focused onfocus='front_panel="FILMS";{if $vers_fbx<=4}location{else}service{/if}="ts://127.0.0.1?bidule=0&ox=0&oy=0&ow=720&oh=576,&ix=0&iy=0&iw=360&ih=192";' href="../../module/films/index1.php">
</a>
- <a onfocus='front_panel="MODULES";service="ts://127.0.0.1?bidule=0&ox=0&oy=0&ow=720&oh=576,&ix=0&iy=384&iw=360&ih=192";' href="../../module/_menu/menu.php?show=1">
+ <a onfocus='front_panel="MODULES";{if $vers_fbx<=4}location{else}service{/if}="ts://127.0.0.1?bidule=0&ox=0&oy=0&ow=720&oh=576,&ix=0&iy=384&iw=360&ih=192";' href="../../module/_menu/menu.php?show=1">
</a>
- <a onfocus='front_panel="PHOTO";service="ts://127.0.0.1?bidule=0&ox=0&oy=0&ow=720&oh=576,&ix=360&iy=192&iw=360&ih=192";' href="../../module/diaporama/index1.php">
+ <a onfocus='front_panel="PHOTO";{if $vers_fbx<=4}location{else}service{/if}="ts://127.0.0.1?bidule=0&ox=0&oy=0&ow=720&oh=576,&ix=360&iy=192&iw=360&ih=192";' href="../../module/diaporama/index1.php">
</a>
- <a onfocus='front_panel="AUDIO";service="ts://127.0.0.1?bidule=0&ox=0&oy=0&ow=720&oh=576,&ix=0&iy=192&iw=360&ih=192";' href="../../module/mp3/lecteuraudio.php">
+ <a onfocus='front_panel="AUDIO";{if $vers_fbx<=4}location{else}service{/if}="ts://127.0.0.1?bidule=0&ox=0&oy=0&ow=720&oh=576,&ix=0&iy=192&iw=360&ih=192";' href="../../module/mp3/lecteuraudio.php">
</a>
- <a onfocus='front_panel="BIBLIOTHEQUE";service="ts://127.0.0.1?bidule=0&ox=0&oy=0&ow=720&oh=576,&ix=360&iy=0&iw=360&ih=192";' href="../../module/films/catalogue.php">
+ <a onfocus='front_panel="BIBLIOTHEQUE";{if $vers_fbx<=4}location{else}service{/if}="ts://127.0.0.1?bidule=0&ox=0&oy=0&ow=720&oh=576,&ix=360&iy=0&iw=360&ih=192";' href="../../module/films/catalogue.php">
</a>
{/if}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ara...@us...> - 2007-05-08 13:35:22
|
Revision: 146
http://svn.sourceforge.net/easybox-mod/?rev=146&view=rev
Author: aragornis
Date: 2007-05-08 06:35:18 -0700 (Tue, 08 May 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/_framework/fonctions_partagees.inc.php
trunk/module/modules/index1.php
trunk/module/modules/modules.tpl
trunk/skin/mediacenter/framework_skin.php
Modified: trunk/_framework/fonctions_partagees.inc.php
===================================================================
--- trunk/_framework/fonctions_partagees.inc.php 2007-05-08 12:49:03 UTC (rev 145)
+++ trunk/_framework/fonctions_partagees.inc.php 2007-05-08 13:35:18 UTC (rev 146)
@@ -704,4 +704,7 @@
}
}
+function add_download($name){
+ echo @file_get_contents('http://www.easybox-mod.org/add_dl.php?name='.$name);
+}
?>
Modified: trunk/module/modules/index1.php
===================================================================
--- trunk/module/modules/index1.php 2007-05-08 12:49:03 UTC (rev 145)
+++ trunk/module/modules/index1.php 2007-05-08 13:35:18 UTC (rev 146)
@@ -44,6 +44,7 @@
if(utf8_decode($element->nom)==urldecode($_GET['installnewmod'])){
download_file($ini['download']['patch'].utf8_decode($element->fichier), $RACINE_REP.'module/'.strtolower(str_replace(' ','',supprime_accents(utf8_decode($element->nom)))).'/', $element->nom);
add_module(utf8_decode($element->nom), strtolower(str_replace(' ','',supprime_accents(utf8_decode($element->nom)))).'/', 'index1.php', '1', '1', '1', '1', '1', utf8_decode($element->version), utf8_decode($element->description), 'Module', 'Alone', get_id_of_categorie(utf8_decode($element->cat)));
+ add_download($element->nom);
}
//-- R\xE9initialise la liste des modules
get_module_list();
@@ -68,6 +69,7 @@
if(utf8_decode($element->nom)==$_GET['installnewskin']){
download_file($ini['download']['patch'].utf8_decode($element->fichier), $RACINE_REP.'skin/'.utf8_decode($element->nom).'/');
add_module(utf8_decode($element->nom), utf8_decode($element->nom).'/', '', '', '', '', '', '', utf8_decode($element->version), utf8_decode($element->description), 'Skin', 'Alone', '');
+ add_download($element->nom);
}
//-- R\xE9initialise la liste des modules
get_module_list();
Modified: trunk/module/modules/modules.tpl
===================================================================
--- trunk/module/modules/modules.tpl 2007-05-08 12:49:03 UTC (rev 145)
+++ trunk/module/modules/modules.tpl 2007-05-08 13:35:18 UTC (rev 146)
@@ -1,4 +1,3 @@
-<br>
{if $action=="mod" OR $action=="skin"}
{section name=mod loop=$MOD start=$MIN max=4}
{if $smarty.section.mod.first}
@@ -12,7 +11,7 @@
<b>Version</b> : {$MOD[mod].version}<br>
<b>Description</b> : {$MOD[mod].description}</td>
{if NOT $MOD[mod].current}{if $action=="skin"}<td width="20"><a href="index1.php?setskinid={$MOD[mod].id}&action={$action}" onfocus='aide="Activer la {$MOD[mod].nom}";'><table width="20" height="20" border="0" cellpadding="0" cellspacing="0" bgcolor="#COULEUR_FOND1#" abgcolor="{#COULEUR_ALINK#}"><tr height="20"><td align=center width="20" height="20" align="center" valign="middle"><img src="{$INTERFACE_REP}valider.gif" border="0" width="20" height="20"></td></tr></table></a></td>{else}<td> </td>{/if}
- {if NOT ($MOD[mod].dep=='Easybox Core' AND $action=="skin")}<td width="20"><a href="index1.php?delid={$MOD[mod].id}&action={$action}" onfocus='aide="Supprimer {if $action=="skin"}la skin{else}le module{/if} {$MOD[mod].nom}";'><table width="20" height="20" border="0" cellpadding="0" cellspacing="0" bgcolor="#COULEUR_FOND1#" abgcolor="{#COULEUR_ALINK#}"><tr height="20"><td align=center width="20" height="20" align="center" valign="middle"><img src="{$INTERFACE_REP}delete.gif" border="0" width="20" height="20"></td></tr></table></a></td>{else}<td> </td>{/if}{/if}
+ {if NOT ($MOD[mod].dep=='Easybox Core' AND $action=="skin")}<td width="20"><a href="index1.php?delid={$MOD[mod].id}&action={$action}" onfocus='aide="Supprimer {if $action=="skin"}la skin{else}le module{/if} {$MOD[mod].nom}";'><table width="20" height="20" border="0" cellpadding="0" cellspacing="0" bgcolor="#COULEUR_FOND1#" abgcolor="{#COULEUR_ALINK#}"><tr height="20"><td align=center width="20" height="20" align="center" valign="middle"><img src="{$INTERFACE_REP}delete.gif" border="0" width="20" height="20"></td></tr></table></a></td>{else}<td> </td>{/if}{else}<td> </td><td> </td>{/if}
</tr>
{if $smarty.section.mod.last}
<tr><td align="center" colspan="2">{if !$_multipage.is_last_page}{suivant} - {/if}{pagination}</td></tr>
Modified: trunk/skin/mediacenter/framework_skin.php
===================================================================
--- trunk/skin/mediacenter/framework_skin.php 2007-05-08 12:49:03 UTC (rev 145)
+++ trunk/skin/mediacenter/framework_skin.php 2007-05-08 13:35:18 UTC (rev 146)
@@ -54,25 +54,45 @@
// Gestion des multipages
$smarty->register_function('precedent', '_multipage_prec');
$smarty->register_function('suivant', '_multipage_suiv');
+$smarty->register_function('pagination', '_multipage_pagination');
-function start_multi($lien,$step){
-global $_multipage_lien, $_multipage_step, $_GET, $min, $smarty;
- $_multipage_lien = $lien;
- $_multipage_step = $step;
+function start_multi($lien,$step,$total=0){
+global $_multipage, $_GET, $min, $smarty;
(isset($_GET['start'])?$min=$_GET['start']:$min=0);
- $smarty->assign('MIN',&$min);
+ $_multipage['lien'] = $lien;
+ $_multipage['step'] = $step;
+ $_multipage['total'] = $total;
+ $_multipage['nb_page'] = ceil($total/$step);
+ $_multipage['current_page'] = ceil(($min/$step)+1);
+ $_multipage['is_last_page'] = ($_multipage['current_page']==$_multipage['nb_page']);
+ $_multipage['is_first_page'] = ($_multipage['current_page']==1);
+ $_multipage['min_max'] = $step*($_multipage['nb_page']-1);
+ $smarty->assign('_multipage',$_multipage);
+ $smarty->assign_by_ref('MIN',$min);
}
function _multipage_prec(){
-global $_multipage_lien, $_multipage_step, $MENU_ALT, $INTERFACE_REP, $min, $LINK;
- $MENU_ALT[]=array('lien'=>$_multipage_lien.'&start='.max(0,$min-$_multipage_step), 'nom'=>'<img src="'.$INTERFACE_REP.'btn_vert.gif" border="0"> Pr\xE9c\xE9dent', 0,'front_pannel'=>'Pr\xE9c\xE9dent');
- $LINK['green']=$_multipage_lien.'&start='.max(0,$min-$_multipage_step);
+global $_multipage, $MENU_ALT, $INTERFACE_REP, $min, $LINK;
+ if(!$_multipage['is_first_page']){
+ $LINK['green'] = $_multipage['lien'].'&start='.max(0,$min-$_multipage['step']);
+ $MENU_ALT[]=array('lien'=>$_multipage['lien'].'&start='.max(0,$min-$_multipage['step']), 'nom'=>'<img src="'.$INTERFACE_REP.'btn_vert.gif" border="0"> Pr\xE9c\xE9dent', 0,'front_pannel'=>'Pr\xE9c\xE9dent');
+ }else{
+ return false;
+ }
}
function _multipage_suiv(){
-global $_multipage_lien, $_multipage_step, $MENU_ALT, $INTERFACE_REP, $min, $LINK;
- $MENU_ALT[]=array('lien'=>$_multipage_lien.'&start='.($min+$_multipage_step), 'nom'=>'<img src="'.$INTERFACE_REP.'btn_bleu.gif" border="0"> Suivant', 0,'front_pannel'=>'Suivant');
- $LINK['blue']=$_multipage_lien.'&start='.($min+$_multipage_step);
+global $_multipage, $MENU_ALT, $INTERFACE_REP, $min, $LINK;
+ if(!$_multipage['is_last_page']){
+ $LINK['blue'] = $_multipage['lien'].'&start='.($min+$_multipage['step']);
+ $MENU_ALT[]=array('lien'=>$_multipage['lien'].'&start='.($min+$_multipage['step']), 'nom'=>'<img src="'.$INTERFACE_REP.'btn_bleu.gif" border="0"> Suivant', 0,'front_pannel'=>'Suivant');
+ }else{
+ return false;
+ }
}
-
+
+function _multipage_pagination(){
+global $_multipage;
+ //return '<font size="1">Page '.$_multipage['current_page'].' / '.$_multipage['nb_page'].'</font>';
+}
?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ara...@us...> - 2007-05-08 12:49:11
|
Revision: 145
http://svn.sourceforge.net/easybox-mod/?rev=145&view=rev
Author: aragornis
Date: 2007-05-08 05:49:03 -0700 (Tue, 08 May 2007)
Log Message:
-----------
R?\195?\169solution du probleme des dvd avec accents dans le path
Mise au niveau du module "modules" avec gestion multipage
R?\195?\169solution du probl?\195?\168me de pause ?
Modified Paths:
--------------
trunk/_utilisateur/multiposte.m3u
trunk/module/_explorateur/explorateur.tpl
trunk/module/dvd/index1.php
trunk/module/dvd/playrep.php
trunk/module/films/lecture.php
trunk/module/modules/index1.php
trunk/module/modules/modules.tpl
trunk/version.html
Modified: trunk/_utilisateur/multiposte.m3u
===================================================================
--- trunk/_utilisateur/multiposte.m3u 2007-05-05 10:40:17 UTC (rev 144)
+++ trunk/_utilisateur/multiposte.m3u 2007-05-08 12:49:03 UTC (rev 145)
@@ -53,6 +53,12 @@
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=220
#EXTINF:0,36 - Mangas
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=253
+#EXTINF:0,37 - MCM
+rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=621
+#EXTINF:0,38 - MCM TOP
+rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=622
+#EXTINF:0,39 - MCM POP
+rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=623
#EXTINF:0,40 - M6 Music Hits
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=430
#EXTINF:0,41 - M6 Music Rock
@@ -85,6 +91,8 @@
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=254
#EXTINF:0,57 - NRJ 12 HD
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=617
+#EXTINF:0,58 - NRJ Hits
+rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=620
#EXTINF:0,59 - Mizik Tropical
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=468
#EXTINF:0,61 - Equidia
@@ -159,8 +167,6 @@
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=359
#EXTINF:0,133 - Astro Center TV
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=415
-#EXTINF:0,134 - Terre d'infos
-rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=437
#EXTINF:0,150 - TLM
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=267
#EXTINF:0,151 - TLT
@@ -347,7 +353,7 @@
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=463
#EXTINF:0,289 - Star TV
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=464
-#EXTINF:0,290 - TGRT
+#EXTINF:0,290 - Fox Türk
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=465
#EXTINF:0,291 - NTV Avrupa
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=466
@@ -417,8 +423,6 @@
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=302
#EXTINF:0,324 - France 3 Rhône-Alpes
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=303
-#EXTINF:0,999 - Mire FREEBOX
-rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=308
#EXTINF:0,10001 - Europe 1
#EXTVLCOPT:ts-es-id-pid
#EXTVLCOPT:no-video
Modified: trunk/module/_explorateur/explorateur.tpl
===================================================================
--- trunk/module/_explorateur/explorateur.tpl 2007-05-05 10:40:17 UTC (rev 144)
+++ trunk/module/_explorateur/explorateur.tpl 2007-05-08 12:49:03 UTC (rev 145)
@@ -147,7 +147,7 @@
<td width="30" align="center">
{if $PLAYREP}
-<a href="{$PAGE_LECT_REP}?toplay={$REP|urlencode}&type=playrep" onfocus='aide="Lire le dossier en entier";'><table width="20" height="20" border="0" cellpadding="0" cellspacing="0" bgcolor="{#COULEUR_FOND1#}" abgcolor="{#COULEUR_ALINK#}"><tr height="20"><td align=center width="20" height="20" align="center" valign="middle"><img src="{$SKIN_REP}dossier/rep_all.gif" border="0" width="20" height="20"></td></tr></table></a>
+<a href="{$PAGE_LECT_REP}?toplay={$REP|urlencode}&type=playrep" onfocus='aide="{if $IS_DVD}Lire le dossier en tant que DVD{else}Lire le dossier en entier{/if}";'><table width="20" height="20" border="0" cellpadding="0" cellspacing="0" bgcolor="{#COULEUR_FOND1#}" abgcolor="{#COULEUR_ALINK#}"><tr height="20"><td align=center width="20" height="20" align="center" valign="middle"><img src="{$SKIN_REP}dossier/rep_all.gif" border="0" width="20" height="20"></td></tr></table></a>
{/if}
</td><td width="30" align="center">
{if $AFF_FAVORIS}
Modified: trunk/module/dvd/index1.php
===================================================================
--- trunk/module/dvd/index1.php 2007-05-05 10:40:17 UTC (rev 144)
+++ trunk/module/dvd/index1.php 2007-05-08 12:49:03 UTC (rev 145)
@@ -32,6 +32,7 @@
}
}
save_variable('statutdvd', 'disques');
+ $smarty->assign('IS_DVD',true);
$smarty->assign('disques_dispo',$disques_dispo);
$smarty->assign('disques_optique',$disques_optique);
$smarty->assign('CONTENT',$smarty->fetch('dvd.tpl'));
Modified: trunk/module/dvd/playrep.php
===================================================================
--- trunk/module/dvd/playrep.php 2007-05-05 10:40:17 UTC (rev 144)
+++ trunk/module/dvd/playrep.php 2007-05-08 12:49:03 UTC (rev 145)
@@ -11,8 +11,7 @@
eval($contenu_html);
if(!isset($_GET['mode'])){
- $basename = stripslashes(urldecode($_REQUEST['toplay']));
-
+ $basename = $_REQUEST['toplay'];
$pisteaudio = $ini['multimedia']['sortiefreebox'];
$decallage = $ini['multimedia']['compensation'];
@@ -27,7 +26,7 @@
$play = 'type=32';
}
- $basename = realpath($basename);
+ $basename = ereg_replace ("\\\'", "'", $basename);
if((substr($basename, -1, 1)=='\\' || substr($basename, -1, 1)=='/') && strlen($basename)<=3){
$basename=substr($basename, 0, (strlen($basename)-1));
@@ -36,12 +35,12 @@
//Ajout dans la base de donn\xE9e pour les retours
save_variable('lastexpl', 'dvd');
- $basename = 'dvdsimple://'.$basename;
+ $basename = utf8_encode('dvdsimple://'.$basename);
play_fichier($play,$basename,0,'dvd');
//$META['refresh'] = '2;url=playrep.php?mode=1';
$META['refresh'] = '0;url='.$MODULE.'films/lecture.php';
- $affich = 'Veuillez patienter pendant la construction des menus...';
+ $affich = 'Veuillez patienter pendant la redirection...';
}elseif($_GET['mode']==1 && is_array($title)){
Modified: trunk/module/films/lecture.php
===================================================================
--- trunk/module/films/lecture.php 2007-05-05 10:40:17 UTC (rev 144)
+++ trunk/module/films/lecture.php 2007-05-08 12:49:03 UTC (rev 145)
@@ -11,10 +11,10 @@
$META['front_panel'] = strtoupper($VLC['etat']);
//Si aucune frame vid\xE9o n'est affich\xE9e :
-if($VLC['etat']!='pause'){
+if($VLC['etat']=='Playing' OR $_REQUEST['control']=='pause'){
$META['nopicture'] = '20;url=lecture.php?control=stop&signet=noload&errorload=1';
}else{
- $META['nopicture'] = '';
+ $META['nopicture'] = 'none';
}
$affiche ="";
@@ -84,7 +84,7 @@
// Micht : Utilisation d'une page de skin
$message = $smarty->fetch('signet_ask.tpl');
}
- } elseif($control!='seek')
+ } elseif($_REQUEST['control']!='seek')
{
$control = $_REQUEST['control'];
$OSD = $control;
Modified: trunk/module/modules/index1.php
===================================================================
--- trunk/module/modules/index1.php 2007-05-05 10:40:17 UTC (rev 144)
+++ trunk/module/modules/index1.php 2007-05-08 12:49:03 UTC (rev 145)
@@ -26,9 +26,9 @@
array('lien'=>'index1.php?action=skin', 'nom'=>'Skins install\xE9es', 'selected'=>$_GET['action']=='skin'),
array('lien'=>'index1.php?action=newskin', 'nom'=>'Nouv. skins', 'selected'=>$_GET['action']=='newskin'),
array('lien'=>'index1.php?action=options', 'nom'=>'Option', 'selected'=>$_GET['action']=='options'));
-
+/*
(isset($_GET['min'])?$min=$_GET['min']:$min=0);
-$smarty->assign('MIN',$min);
+$smarty->assign('MIN',$min);*/
if(!isset($_GET['action'])){
$_GET['action'] = 'mod';
@@ -77,7 +77,9 @@
switch($_GET['action']){
case 'mod':
- $smarty->assign('MOD',get_installed_modules());
+ $MOD = get_installed_modules();
+ start_multi('index1.php?action=mod',4,count($MOD));
+ $smarty->assign('MOD',$MOD);
$smarty->assign('TITRE','Modules install\xE9s');
break;
case 'newmod':
@@ -90,12 +92,14 @@
$MOD[] = array('nom'=> utf8_decode($elem->nom),'version'=> utf8_decode($elem->version),'description'=> utf8_decode($elem->description),'auteur'=> utf8_decode($elem->auteur),'fichier'=> utf8_decode($elem->fichier),'img'=>'http://www.easybox-mod.org/modules/addon/screen/'.utf8_decode($elem->screen));
}
}
-
+ start_multi('index1.php?action=newmod',4,count($MOD));
$smarty->assign('MOD',$MOD);
$smarty->assign('TITRE','Modules installables');
break;
case 'skin':
- $smarty->assign('MOD',get_installed_skins());
+ $MOD = get_installed_skins();
+ start_multi('index1.php?action=skin',4,count($MOD));
+ $smarty->assign('MOD',$MOD);
$smarty->assign('TITRE','Skins install\xE9es');
break;
case 'newskin':
@@ -108,7 +112,7 @@
$MOD[] = array('nom'=>utf8_decode($element->nom),'version'=>utf8_decode($element->version),'description'=>utf8_decode($element->description),'auteur'=>utf8_decode($element->auteur),'fichier'=>utf8_decode($element->fichier),'img'=>'http://www.easybox-mod.org/modules/addon/screen/'.utf8_decode($element->screen));
}
}
-
+ start_multi('index1.php?action=newskin',4,count($MOD));
$smarty->assign('MOD',$MOD);
$smarty->assign('TITRE','Skins installables');
break;
Modified: trunk/module/modules/modules.tpl
===================================================================
--- trunk/module/modules/modules.tpl 2007-05-05 10:40:17 UTC (rev 144)
+++ trunk/module/modules/modules.tpl 2007-05-08 12:49:03 UTC (rev 145)
@@ -2,12 +2,8 @@
{if $action=="mod" OR $action=="skin"}
{section name=mod loop=$MOD start=$MIN max=4}
{if $smarty.section.mod.first}
- {if $MIN!=0}
- {assign var=temp value=$MIN-4}
- {attribbouton touche="green" lien="index1.php?action=$action&min=$temp"}
- <a href="index1.php?action={$action}&min={$temp}"><img src="{$INTERFACE_REP}btn_vert.gif" border="0"> Pr\xE9c\xE9dent</a>
- {/if}
<table width="500" border="0" cellspacing="0" cellpadding="2" align="left" valign="top">
+ {if !$_multipage.is_first_page}<tr><td align="center" colspan="2">{precedent}</td></tr>{/if}
{/if}
<tr>
@@ -19,13 +15,9 @@
{if NOT ($MOD[mod].dep=='Easybox Core' AND $action=="skin")}<td width="20"><a href="index1.php?delid={$MOD[mod].id}&action={$action}" onfocus='aide="Supprimer {if $action=="skin"}la skin{else}le module{/if} {$MOD[mod].nom}";'><table width="20" height="20" border="0" cellpadding="0" cellspacing="0" bgcolor="#COULEUR_FOND1#" abgcolor="{#COULEUR_ALINK#}"><tr height="20"><td align=center width="20" height="20" align="center" valign="middle"><img src="{$INTERFACE_REP}delete.gif" border="0" width="20" height="20"></td></tr></table></a></td>{else}<td> </td>{/if}{/if}
</tr>
{if $smarty.section.mod.last}
+ <tr><td align="center" colspan="2">{if !$_multipage.is_last_page}{suivant} - {/if}{pagination}</td></tr>
</table>
- {if $MIN+$smarty.section.mod.total < count($MOD)}
- {assign var=temp value=$MIN+4}
- {attribbouton touche="blue" lien="index1.php?action=$action&min=$temp"}
- <a href="index1.php?action={$action}&min={$temp}"><img src="{$INTERFACE_REP}btn_bleu.gif" border="0"> Suivant</a>
{/if}
- {/if}
{sectionelse}
{if $action=="skin"}
Aucune skin suppl\xE9mentaire n'est install\xE9e. Pour en installer, rendez-vous dans la partie "Nouvelles skins".
@@ -34,15 +26,11 @@
{/if}
{/section}
{elseif $action=="newmod" OR $action=="newskin"}
- {section name=mod loop=$MOD}
+ {section name=mod loop=$MOD start=$MIN max=4}
{if $smarty.section.mod.first}
- {if $MIN!=0}
- {assign var=temp value=$MIN-4}
- {attribbouton touche="green" lien="index1.php?action=$action&min=$temp"}
- <a href="index1.php?action={$action}&min={$temp}"><img src="{$INTERFACE_REP}btn_vert.gif" border="0"> Pr\xE9c\xE9dent</a>
- {/if}
<table width="500" border="0" cellspacing="0" cellpadding="2" align="left" valign="top">
+ {if !$_multipage.is_first_page}<tr><td align="center" colspan="2">{precedent}</td></tr>{/if}
{/if}
<tr>
@@ -53,13 +41,9 @@
<td width="20"><a href="index1.php?install{$action}={$MOD[mod].nom|urlencode}&action={$action}"onfocus='aide="Installer {if $action=="newskin"}la skin{else}le module{/if} {$MOD[mod].nom}";'><table width="20" height="20" border="0" cellpadding="0" cellspacing="0" bgcolor="{#COULEUR_FOND1#}" abgcolor="{#COULEUR_ALINK#}"><tr height="20"><td align=center width="20" height="20" align="center" valign="middle"><img src="{$INTERFACE_REP}valider.gif" border="0" width="20" height="20"></td></tr></table></a></td>
</tr>
{if $smarty.section.mod.last}
+ <tr><td align="center" colspan="2">{if !$_multipage.is_last_page}{suivant} - {/if}{pagination}</td></tr>
</table>
- {if $MIN+$smarty.section.mod.total < count($MOD)}
- {assign var=temp value=$MIN+4}
- {attribbouton touche="blue" lien="index1.php?action=$action&min=$temp"}
- <a href="index1.php?action={$action}&min={$temp}"><img src="{$INTERFACE_REP}btn_bleu.gif" border="0"> Suivant</a>
{/if}
- {/if}
{sectionelse}
{if $action=="newskin"}
Modified: trunk/version.html
===================================================================
--- trunk/version.html 2007-05-05 10:40:17 UTC (rev 144)
+++ trunk/version.html 2007-05-08 12:49:03 UTC (rev 145)
@@ -4,6 +4,6 @@
</head>
<body>
<h1>Easybox</h1>
-<h2>4.0.2</h2>
+<h2>4.0.3</h2>
</body>
</html>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gu...@us...> - 2007-05-05 10:40:22
|
Revision: 144
http://svn.sourceforge.net/easybox-mod/?rev=144&view=rev
Author: guyou
Date: 2007-05-05 03:40:17 -0700 (Sat, 05 May 2007)
Log Message:
-----------
Gel de la version 4.0.3
Added Paths:
-----------
tags/easybox-4.0.3/
Copied: tags/easybox-4.0.3 (from rev 143, trunk)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ara...@us...> - 2007-05-01 20:48:22
|
Revision: 143
http://svn.sourceforge.net/easybox-mod/?rev=143&view=rev
Author: aragornis
Date: 2007-05-01 13:48:20 -0700 (Tue, 01 May 2007)
Log Message:
-----------
v4.0.3
Modified Paths:
--------------
trunk/_utilisateur/modules.db
Modified: trunk/_utilisateur/modules.db
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ara...@us...> - 2007-05-01 20:19:03
|
Revision: 142
http://svn.sourceforge.net/easybox-mod/?rev=142&view=rev
Author: aragornis
Date: 2007-05-01 13:19:00 -0700 (Tue, 01 May 2007)
Log Message:
-----------
Mise ?\195?\160 jour de la navigation multipage avec gestion de la pagination + r?\195?\169paration d'un bug sur MacOS
Mise ?\195?\160 jour des quatre modules ultilisant la gestion multipage et des explorateurs
Mise en place du htaccess pour garantir la compatibilit?\195?\169 sur MacOS
Mise ?\195?\160 jour de la skin simplegreen pour qu'elle remarche
Modified Paths:
--------------
trunk/module/_explorateur/explorateur.tpl
trunk/module/_explorateur/index1.php
trunk/module/cinefil/index1.php
trunk/module/cinefil/sorties_cine.tpl
trunk/module/clips/clips.tpl
trunk/module/clips/index1.php
trunk/module/dailymotion/dailymotion.tpl
trunk/module/dailymotion/index1.php
trunk/module/youtube/index1.php
trunk/module/youtube/youtube.tpl
trunk/skin/simple/framework_skin.php
trunk/skin/simplegreen/framework_skin.php
Added Paths:
-----------
trunk/.htaccess
Added: trunk/.htaccess
===================================================================
--- trunk/.htaccess (rev 0)
+++ trunk/.htaccess 2007-05-01 20:19:00 UTC (rev 142)
@@ -0,0 +1 @@
+php_flag short_open_tag on
Modified: trunk/module/_explorateur/explorateur.tpl
===================================================================
--- trunk/module/_explorateur/explorateur.tpl 2007-05-01 15:37:58 UTC (rev 141)
+++ trunk/module/_explorateur/explorateur.tpl 2007-05-01 20:19:00 UTC (rev 142)
@@ -98,8 +98,8 @@
{*######## Fin Affichage des raccourcis rapides ########*}
-{if $MIN!=0}
- <tr><td colspan="2">{precedent} <a href="{$PAGE_EXPLO}?start=0&directory={$REP|urlencode}&mode={$MODE}"><font size=2>D\xE9but du r\xE9pertoire</font></a></td></tr>
+{if !$_multipage.is_first_page}
+ <tr><td colspan="2">{precedent}<font size="1"> <a href="{$PAGE_EXPLO}?start=0&directory={$REP|urlencode}&mode={$MODE}">D\xE9but du r\xE9pertoire</a></font></td></tr>
{/if}
{if $Nb_rep_path >='2' AND $MIN==0}
@@ -143,13 +143,8 @@
{/if}
{/section}
-{if $MIN+$smarty.section.files.total<count($T_affich)}
- <tr><td colspan="2"><table><tr><td>{suivant} - <font size=2><a href="{$PAGE_EXPLO}?start={$N_affich-$smarty.section.files.total}&directory={$REP|urlencode}&mode={$MODE}">Fin du r\xE9pertoire</a> - Page {$MIN/$NUM_ROW_AFFICH+1|ceil} / {$N_affich/$NUM_ROW_AFFICH|ceil}</font></td>
-{else}
- <tr><td colspan="2"><table><tr><td><font size=2>Page {$MIN/$NUM_ROW_AFFICH+1|ceil} / {$N_affich/$NUM_ROW_AFFICH|ceil}</font></td>
-{/if}
+ <tr><td colspan="2"><table><tr><td>{if !$_multipage.is_last_page}{suivant}<font size=1> - <a href="{$PAGE_EXPLO}?start={$_multipage.min_max}&directory={$REP|urlencode}&mode={$MODE}">Fin du r\xE9pertoire</a> - </font>{/if}{pagination}</td>
-
<td width="30" align="center">
{if $PLAYREP}
<a href="{$PAGE_LECT_REP}?toplay={$REP|urlencode}&type=playrep" onfocus='aide="Lire le dossier en entier";'><table width="20" height="20" border="0" cellpadding="0" cellspacing="0" bgcolor="{#COULEUR_FOND1#}" abgcolor="{#COULEUR_ALINK#}"><tr height="20"><td align=center width="20" height="20" align="center" valign="middle"><img src="{$SKIN_REP}dossier/rep_all.gif" border="0" width="20" height="20"></td></tr></table></a>
@@ -166,3 +161,4 @@
{/if}
</table>
{$FOOTER}
+
Modified: trunk/module/_explorateur/index1.php
===================================================================
--- trunk/module/_explorateur/index1.php 2007-05-01 15:37:58 UTC (rev 141)
+++ trunk/module/_explorateur/index1.php 2007-05-01 20:19:00 UTC (rev 142)
@@ -147,8 +147,16 @@
RETURN ($chemin);
}
+// R\xE9cup\xE9ration de la liste des fichiers
+$fichiers = FICHIERS();
+$smarty->assign('DISQUES',unserialize(get_variable('disques')));
+$T_affich = array_merge($fichiers[0],$fichiers[1]);
+$smarty->assign('T_rep',$fichiers[0]);
+$smarty->assign('T_file',$fichiers[1]);
+$smarty->assign('T_affich',$T_affich);
+
// Lancement de la gestion multipage
-start_multi($page_explo.'?directory='.urlencode($rep).'&mode='.$_GET['mode'],14);
+start_multi($page_explo.'?directory='.urlencode($rep).'&mode='.$_GET['mode'],14,count($T_affich));
//Ajout dans la base de donn\xE9e pour les retours
if($extension==$ini['explorateur']['ext']){
@@ -185,13 +193,6 @@
$smarty->assign('MIN',$min);
$smarty->assign('Nb_rep_path',count($path));
-$fichiers = FICHIERS();
-
-$smarty->assign('DISQUES',unserialize(get_variable('disques')));//unserialize(get_variable('disques')));
-
-$smarty->assign('T_rep',$fichiers[0]);
-$smarty->assign('T_file',$fichiers[1]);
-$smarty->assign('T_affich',array_merge($fichiers[0],$fichiers[1]));
$smarty->assign('CONTENT',$smarty->fetch('explorateur.tpl'));
if(!isset($nointerface)){
$smarty->display('interface.tpl');
Modified: trunk/module/cinefil/index1.php
===================================================================
--- trunk/module/cinefil/index1.php 2007-05-01 15:37:58 UTC (rev 141)
+++ trunk/module/cinefil/index1.php 2007-05-01 20:19:00 UTC (rev 142)
@@ -37,10 +37,9 @@
$LINK['red']= page_retour_menu();
-start_multi('index1.php?week='.$week,8);
+start_multi('index1.php?week='.$week,8,count($SORTIES));
$smarty->assign('TITRE',$titre);
-$smarty->assign('MIN',$min);
$smarty->assign('SORTIES',$SORTIES);
$smarty->assign('week',$week);
Modified: trunk/module/cinefil/sorties_cine.tpl
===================================================================
--- trunk/module/cinefil/sorties_cine.tpl 2007-05-01 15:37:58 UTC (rev 141)
+++ trunk/module/cinefil/sorties_cine.tpl 2007-05-01 20:19:00 UTC (rev 142)
@@ -1,7 +1,7 @@
{section name=sorties loop=$SORTIES max=8 start=$MIN}
{cycle name=place assign=place print=false values="3,2,1,0"}
{if $smarty.section.sorties.first}
- {if $MIN!=0}{precedent}{/if}
+ {if !$_multipage.is_first_page}{precedent}{/if}
<table border="0" cellpadding="0" cellspacing="0" width="500" height="360" align="center"><tr>
{/if}
@@ -17,8 +17,7 @@
{if $place >= 1}<td> </td>{/if}
</tr>
</table>
- {if $MIN+$smarty.section.sorties.total<count($SORTIES)}{suivant}{/if}
-
+ {if !$_multipage.is_last_page}{suivant} - {/if}{pagination}
{/if}
{/section}
Modified: trunk/module/clips/clips.tpl
===================================================================
--- trunk/module/clips/clips.tpl 2007-05-01 15:37:58 UTC (rev 141)
+++ trunk/module/clips/clips.tpl 2007-05-01 20:19:00 UTC (rev 142)
@@ -4,7 +4,7 @@
{cycle name=place assign=place print=false values="4,3,2,1,0"}
{if $smarty.section.clip.first}
<table border="0" cellpadding="0" cellspacing="0" width="500" align="center"><tr>
- {if $MIN!=0}
+ {if !$_multipage.is_first_page}
<td colspan="5" align=center>{precedent}</td></tr><tr>
{/if}
{/if}
@@ -29,7 +29,7 @@
<td> </td>
{/if}
</tr>
- <tr><td colspan="5" align="center" height="25" valign="bottom">{if $MIN+$NUM_ROW_AFFICH < $TOTAL}{suivant} - {/if}{$DEB+$START} \xE0 {$FIN-10+$START} sur {$TOTAL}</td></tr>
+ <tr><td colspan="5" align="center" height="25" valign="bottom">{if !$_multipage.is_last_page}{suivant} - {/if}{pagination}</td></tr>
</table>
{if $SHOW=='tous'}
Modified: trunk/module/clips/index1.php
===================================================================
--- trunk/module/clips/index1.php 2007-05-01 15:37:58 UTC (rev 141)
+++ trunk/module/clips/index1.php 2007-05-01 20:19:00 UTC (rev 142)
@@ -27,7 +27,7 @@
}
function get_recherche($rec){
- $contenu = str_replace("\r\n",'',@file_get_contents('http://search.fr.music.yahoo.com/search/?p='.$rec.'&m=video'));
+ $contenu = str_replace("\r\n",'',@file_get_contents('http://search.fr.music.yahoo.com/search/?p='.urlencode($rec).'&m=video'));
$ereg = '<td bgcolor=......><a href=javascript:playVideos\((.{1,10})\); title="(.{1,50})"><b>(.{1,50})<\/b><\/a><\/td><td bgcolor=......><a href=http:\/\/fr.music.yahoo.com\/ar-(.{1,50})><font title="(.{1,50})">(.{1,50})<\/font><\/a><\/td><td bgcolor=...... align=center class="yss_right';
preg_match_all("/$ereg/s", $contenu, $valeur);
foreach($valeur[2] as $key=>$val){
@@ -49,7 +49,7 @@
}
// Lancement de la gestion multipage
-start_multi('index1.php?show='.$show.$sup,10);
+start_multi('index1.php?show='.$show.$sup,10,0);
// D\xE9termination de la page
$page = floor($min/20)+1;
@@ -66,6 +66,10 @@
$res = get_videos_id($url.'p='.$page);
}
+// RELancement de la gestion multipage pour informer aussi du nombre d'\xE9l\xE9ments
+start_multi('index1.php?show='.$show.$sup,10,$res[3]);
+
+
for ($i=0; $i<26; $i++){
$lettres[] = array(chr(97+$i),chr(65+$i));
}
@@ -77,7 +81,6 @@
$smarty->assign('DEB',$res[1]);
$smarty->assign('FIN',$res[2]);
$smarty->assign('CLIP',$res[0]);
-$smarty->assign('MIN',$min);
$smarty->assign('START',$start);
$smarty->assign('CONTENT',$smarty->fetch('clips.tpl'));
Modified: trunk/module/dailymotion/dailymotion.tpl
===================================================================
--- trunk/module/dailymotion/dailymotion.tpl 2007-05-01 15:37:58 UTC (rev 141)
+++ trunk/module/dailymotion/dailymotion.tpl 2007-05-01 20:19:00 UTC (rev 142)
@@ -3,7 +3,7 @@
{cycle name=place assign=place print=false values="4,3,2,1,0"}
{if $smarty.section.clip.first}
<table border="0" cellpadding="0" cellspacing="0" width="500" align="center"><tr>
- {if $MIN!=0}
+ {if !$_multipage.is_first_page}
<td colspan="5" align=center>{precedent}</td></tr><tr>
{/if}
{/if}
@@ -20,7 +20,7 @@
{if $place >= 2}<td> </td>{/if}
{if $place >= 1}<td> </td>{/if}
</tr>
- <tr><td colspan="5" align="center" height="25" valign="bottom">{if $MIN+$NUM_ROW_AFFICH < $TOTAL}{suivant} - {/if}{$DEB} \xE0 {$FIN}</td></tr>
+ <tr><td colspan="5" align="center" height="25" valign="bottom">{if !$_multipage.is_last_page}{suivant} - {/if}{pagination}</td></tr>
</table>
{/if}
{sectionelse}
Modified: trunk/module/dailymotion/index1.php
===================================================================
--- trunk/module/dailymotion/index1.php 2007-05-01 15:37:58 UTC (rev 141)
+++ trunk/module/dailymotion/index1.php 2007-05-01 20:19:00 UTC (rev 142)
@@ -11,7 +11,7 @@
array('lien'=>'index1.php?show=note', 'nom'=>'Mieux not\xE9s', 'selected'=>$show=='note'),
array('lien'=>'index1.php?show=rec', 'nom'=>'Recherche', 'selected'=>$show=='rec'));
-$title = array('hit'=>'Les plus r\xE9cents', 'new'=>'Les plus vus', 'tous'=>'Les mieux not\xE9s', 'rec'=>'Recherche');
+$title = array('recent'=>'Les plus r\xE9cents', 'vus'=>'Les plus vus', 'note'=>'Les mieux not\xE9s', 'rec'=>'Recherche');
$smarty->assign('TITRE','Vid\xE9os Dailymotion - '.$title[$show]);
function get_videos_id($page){
@@ -45,7 +45,7 @@
$nb_p = 5;
}elseif($show=='rec'){
(isset($_GET['string'])?$string=$_GET['string']:$string='');
- $url = 'http://www.dailymotion.com/rss/relevance/search/'.$string.'/';
+ $url = 'http://www.dailymotion.com/rss/relevance/search/'.urlencode($string).'/';
$sup = '&string='.$string;
}
@@ -60,7 +60,7 @@
if(!($show=='rec' and $string=='')){
$res = get_videos_id($url);
if(count($res)==10){
- $total = ($page+5)*10;
+ $total = ($page+10)*10;
}else{
$total = ($page-1)*10+count($res);
}
@@ -68,6 +68,9 @@
$fin = $page*10;
}
+// RELancement de la gestion multipage pour informer aussi du nombre d'\xE9l\xE9ments
+start_multi('index1.php?show='.$show.$sup,10,$total);
+
$smarty->assign('string',$string);
$smarty->assign('lettres',$lettres);
$smarty->assign('SHOW',$show);
@@ -75,7 +78,6 @@
$smarty->assign('DEB',$deb);
$smarty->assign('FIN',$fin);
$smarty->assign('CLIP',$res);
-$smarty->assign('MIN',$min);
$smarty->assign('START',$start);
$smarty->assign('CONTENT',$smarty->fetch('dailymotion.tpl'));
Modified: trunk/module/youtube/index1.php
===================================================================
--- trunk/module/youtube/index1.php 2007-05-01 15:37:58 UTC (rev 141)
+++ trunk/module/youtube/index1.php 2007-05-01 20:19:00 UTC (rev 142)
@@ -11,12 +11,12 @@
array('lien'=>'index1.php?show=note', 'nom'=>'Mieux not\xE9s', 'selected'=>$show=='note'),
array('lien'=>'index1.php?show=rec', 'nom'=>'Recherche', 'selected'=>$show=='rec'));
-$title = array('hit'=>'Les plus r\xE9cents', 'new'=>'Les plus vus', 'tous'=>'Les mieux not\xE9s', 'rec'=>'Recherche');
+$title = array('recent'=>'Les plus r\xE9cents', 'vus'=>'Les plus vus', 'note'=>'Les mieux not\xE9s', 'rec'=>'Recherche');
$smarty->assign('TITRE','Vid\xE9os Youtube - '.$title[$show]);
function get_videos_id($page){
$contenu = str_replace("\n",'',@file_get_contents($page));
- $ereg = '<a href="\/watch\?v=(.{1,12})"><img src="(.{1,200})" class=" vimg " alt="video" \/><\/a><\/div> <\/div> <div class="vtitle"> <a href="\/watch\?v=(.{1,12})" onclick="_hbLink\(\'(.{1,100})\',\'(.{1,50})\'\);">(.{1,100})<\/a><br\/> <span class="runtime">(.{1,10})<\/span>';
+ $ereg = '<a href="\/watch\?v=(.{1,12})"><img src="(.{1,200})" class=" vimg " alt="video" \/><\/a><\/div> <\/div> <div class="vtitle"> <a href="\/watch\?v=(.{1,12})" onclick="_hbLink\(\'(.{0,100})\',\'(.{1,50})\'\);">(.{1,100})<\/a><br\/> <span class="runtime">(.{1,10})<\/span>';
preg_match_all("/$ereg/s", $contenu, $valeur);
foreach($valeur[1] as $key=>$val){
$retour[] = array('temps'=>$valeur[7][$key], 'titre'=>utf8_decode($valeur[6][$key]), 'id'=>$valeur[1][$key], 'img'=>$valeur[2][$key]);
@@ -25,7 +25,7 @@
}
function get_recherche($rec,$page){
- $contenu = str_replace("\n",'',@file_get_contents('http://www.youtube.com/results?search_query='.$rec.'&search=Search&page='.$page));
+ $contenu = str_replace("\n",'',@file_get_contents('http://www.youtube.com/results?search_query='.urlencode($rec).'&search=Search&page='.$page));
$ereg = '<img src="(.{1,200})" border="0" class="vimg120" \/><\/a><\/div> <\/div> <\/td> <td class="vinfo"> <div class="vSnippetTitle"> <a href="\/watch\?v=(.{1,12})" rel="nofollow" onclick="_hbLink\(\'(.{1,100})\',\'(.{1,50})\'\);">(.{1,100})<\/a><br\/> <span class="runtime">(.{1,10})<\/span>';
preg_match_all("/$ereg/s", $contenu, $valeur);
foreach($valeur[1] as $key=>$val){
@@ -59,7 +59,7 @@
}
// Lancement de la gestion multipage
-start_multi('index1.php?show='.$show.$sup,10);
+start_multi('index1.php?show='.$show.$sup,10,0);
// D\xE9termination de la page
$page = floor($min/20)+1;
@@ -83,6 +83,8 @@
$fin = $page*20;
}
+// RELancement de la gestion multipage pour informer aussi du nombre d'\xE9l\xE9ments
+start_multi('index1.php?show='.$show.$sup,10,$total);
$smarty->assign('LETTRE',$lettre);
$smarty->assign('string',$string);
Modified: trunk/module/youtube/youtube.tpl
===================================================================
--- trunk/module/youtube/youtube.tpl 2007-05-01 15:37:58 UTC (rev 141)
+++ trunk/module/youtube/youtube.tpl 2007-05-01 20:19:00 UTC (rev 142)
@@ -3,7 +3,7 @@
{cycle name=place assign=place print=false values="4,3,2,1,0"}
{if $smarty.section.clip.first}
<table border="0" cellpadding="0" cellspacing="0" width="500" align="center"><tr>
- {if $MIN!=0}
+ {if !$_multipage.is_first_page}
<td colspan="5" align=center>{precedent}</td></tr><tr>
{/if}
{/if}
@@ -20,7 +20,7 @@
{if $place >= 2}<td> </td>{/if}
{if $place >= 1}<td> </td>{/if}
</tr>
- <tr><td colspan="5" align="center" height="25" valign="bottom">{if $MIN+$NUM_ROW_AFFICH < $TOTAL}{suivant} - {/if}{$DEB+$START} \xE0 {$FIN-10+$START} sur {$TOTAL}</td></tr>
+ <tr><td colspan="5" align="center" height="25" valign="bottom">{if !$_multipage.is_last_page}{suivant} - {/if}{pagination}</td></tr>
</table>
{/if}
{sectionelse}
Modified: trunk/skin/simple/framework_skin.php
===================================================================
--- trunk/skin/simple/framework_skin.php 2007-05-01 15:37:58 UTC (rev 141)
+++ trunk/skin/simple/framework_skin.php 2007-05-01 20:19:00 UTC (rev 142)
@@ -50,25 +50,45 @@
// Gestion des multipages
$smarty->register_function('precedent', '_multipage_prec');
$smarty->register_function('suivant', '_multipage_suiv');
+$smarty->register_function('pagination', '_multipage_pagination');
-function start_multi($lien,$step){
-global $_multipage_lien, $_multipage_step, $_GET, $min, $smarty;
- $_multipage_lien = $lien;
- $_multipage_step = $step;
+function start_multi($lien,$step,$total=0){
+global $_multipage, $_GET, $min, $smarty;
(isset($_GET['start'])?$min=$_GET['start']:$min=0);
- $smarty->assign('MIN',&$min);
+ $_multipage['lien'] = $lien;
+ $_multipage['step'] = $step;
+ $_multipage['total'] = $total;
+ $_multipage['nb_page'] = ceil($total/$step);
+ $_multipage['current_page'] = ceil(($min/$step)+1);
+ $_multipage['is_last_page'] = ($_multipage['current_page']==$_multipage['nb_page']);
+ $_multipage['is_first_page'] = ($_multipage['current_page']==1);
+ $_multipage['min_max'] = $step*($_multipage['nb_page']-1);
+ $smarty->assign('_multipage',$_multipage);
+ $smarty->assign_by_ref('MIN',$min);
}
function _multipage_prec(){
-global $_multipage_lien, $_multipage_step, $MENU_ALT, $INTERFACE_REP, $min, $LINK;
- echo '<a href="'.$_multipage_lien.'&start='.max(0,$min-$_multipage_step).'" onfocus=\'aide="Page pr\xE9c\xE9dente";\'><img src="'.$INTERFACE_REP.'btn_vert.gif" border="0"> <font size="2">Pr\xE9c\xE9dent</font></a>';
- $LINK['green']=$_multipage_lien.'&start='.max(0,$min-$_multipage_step);
+global $_multipage, $INTERFACE_REP, $min, $LINK;
+ if(!$_multipage['is_first_page']){
+ $LINK['green'] = $_multipage['lien'].'&start='.max(0,$min-$_multipage['step']);
+ return '<a href="'.$_multipage['lien'].'&start='.max(0,$min-$_multipage['step']).'" onfocus=\'aide="Page pr\xE9c\xE9dente";\'><img src="'.$INTERFACE_REP.'btn_vert.gif" border="0"><font size="1"> Pr\xE9c\xE9dent</font></a>';
+ }else{
+ return false;
+ }
}
function _multipage_suiv(){
-global $_multipage_lien, $_multipage_step, $MENU_ALT, $INTERFACE_REP, $min, $LINK;
- echo '<a href="'.$_multipage_lien.'&start='.($min+$_multipage_step).'" onfocus=\'aide="Page suivante";\'><img src="'.$INTERFACE_REP.'btn_bleu.gif" border="0"> <font size="2">Suivant</font></a>';
- $LINK['blue']=$_multipage_lien.'&start='.($min+$_multipage_step);
+global $_multipage, $INTERFACE_REP, $min, $LINK;
+ if(!$_multipage['is_last_page']){
+ $LINK['blue'] = $_multipage['lien'].'&start='.($min+$_multipage['step']);
+ return '<a href="'.$_multipage['lien'].'&start='.($min+$_multipage['step']).'" onfocus=\'aide="Page suivante";\'><img src="'.$INTERFACE_REP.'btn_bleu.gif" border="0"><font size="1"> Suivant</font></a>';
+ }else{
+ return false;
+ }
}
-
+
+function _multipage_pagination(){
+global $_multipage;
+ return '<font size="1">Page '.$_multipage['current_page'].' / '.$_multipage['nb_page'].'</font>';
+}
?>
Modified: trunk/skin/simplegreen/framework_skin.php
===================================================================
--- trunk/skin/simplegreen/framework_skin.php 2007-05-01 15:37:58 UTC (rev 141)
+++ trunk/skin/simplegreen/framework_skin.php 2007-05-01 20:19:00 UTC (rev 142)
@@ -25,21 +25,21 @@
}
$smarty->assign('BACKGROUND_REP',$BACKGROUND_REP);
-
// Fond d'\xE9cran par d\xE9faut - path d\xE9finit \xE0 partir du r\xE9pertoire /http/skin/simple/
$BACKGROUND = $_COULEUR['BACKGROUND'];
// Fonction responsable de l'affichage du fond d'\xE9cran \xE0 la toute fin du processus de conception de la page (post-filtre de smarty)
function background($output, &$smarty){
- global $contenu_html, $BACKGROUND, $BACKGROUND_REP, $SKIN_REP, $BACKGROUND_TYPE, $FORCED, $_SERVER, $BACK_DONE;
+ global $contenu_html, $BACKGROUND, $BACKGROUND_REP, $SKIN_REP, $BACKGROUND_TYPE, $FORCED, $_SERVER, $BACK_DONE, $smarty;
if(((eregi("stop",$contenu_html) AND $BACKGROUND!="none" AND realpath($BACKGROUND_REP.$BACKGROUND)!='') OR $FORCED) AND !$BACK_DONE){
- if($BACKGROUND_TYPE == 'add'){
+ if($BACKGROUND_TYPE == 'add'){
play_fichier('type=21&temps=8000',realpath($BACKGROUND_REP.$BACKGROUND),1,'photo');
}else{
play_fichier('type=20&temps=8000',realpath($BACKGROUND_REP.$BACKGROUND),1,'photo');
}
//Pour ne pas lancer deux fois le background
$BACK_DONE = 1;
+
}
return($output);
}
@@ -50,25 +50,45 @@
// Gestion des multipages
$smarty->register_function('precedent', '_multipage_prec');
$smarty->register_function('suivant', '_multipage_suiv');
+$smarty->register_function('pagination', '_multipage_pagination');
-function start_multi($lien,$step){
-global $_multipage_lien, $_multipage_step, $_GET, $min, $smarty;
- $_multipage_lien = $lien;
- $_multipage_step = $step;
+function start_multi($lien,$step,$total=0){
+global $_multipage, $_GET, $min, $smarty;
(isset($_GET['start'])?$min=$_GET['start']:$min=0);
- $smarty->assign('MIN',&$min);
+ $_multipage['lien'] = $lien;
+ $_multipage['step'] = $step;
+ $_multipage['total'] = $total;
+ $_multipage['nb_page'] = ceil($total/$step);
+ $_multipage['current_page'] = ceil(($min/$step)+1);
+ $_multipage['is_last_page'] = ($_multipage['current_page']==$_multipage['nb_page']);
+ $_multipage['is_first_page'] = ($_multipage['current_page']==1);
+ $_multipage['min_max'] = $step*($_multipage['nb_page']-1);
+ $smarty->assign('_multipage',$_multipage);
+ $smarty->assign_by_ref('MIN',$min);
}
function _multipage_prec(){
-global $_multipage_lien, $_multipage_step, $MENU_ALT, $INTERFACE_REP, $min, $LINK;
- $MENU_ALT[]=array('lien'=>$_multipage_lien.'&start='.max(0,$min-$_multipage_step), 'nom'=>'<img src="'.$INTERFACE_REP.'btn_vert.gif" border="0"> Pr\xE9c\xE9dent', 0,'front_pannel'=>'Pr\xE9c\xE9dent');
- $LINK['green']=$_multipage_lien.'&start='.max(0,$min-$_multipage_step);
+global $_multipage, $INTERFACE_REP, $min, $LINK;
+ if(!$_multipage['is_first_page']){
+ $LINK['green'] = $_multipage['lien'].'&start='.max(0,$min-$_multipage['step']);
+ return '<a href="'.$_multipage['lien'].'&start='.max(0,$min-$_multipage['step']).'" onfocus=\'aide="Page pr\xE9c\xE9dente";\'><img src="'.$INTERFACE_REP.'btn_vert.gif" border="0"><font size="1"> Pr\xE9c\xE9dent</font></a>';
+ }else{
+ return false;
+ }
}
function _multipage_suiv(){
-global $_multipage_lien, $_multipage_step, $MENU_ALT, $INTERFACE_REP, $min, $LINK;
- $MENU_ALT[]=array('lien'=>$_multipage_lien.'&start='.($min+$_multipage_step), 'nom'=>'<img src="'.$INTERFACE_REP.'btn_bleu.gif" border="0"> Suivant', 0,'front_pannel'=>'Suivant');
- $LINK['blue']=$_multipage_lien.'&start='.($min+$_multipage_step);
+global $_multipage, $INTERFACE_REP, $min, $LINK;
+ if(!$_multipage['is_last_page']){
+ $LINK['blue'] = $_multipage['lien'].'&start='.($min+$_multipage['step']);
+ return '<a href="'.$_multipage['lien'].'&start='.($min+$_multipage['step']).'" onfocus=\'aide="Page suivante";\'><img src="'.$INTERFACE_REP.'btn_bleu.gif" border="0"><font size="1"> Suivant</font></a>';
+ }else{
+ return false;
+ }
}
-
+
+function _multipage_pagination(){
+global $_multipage;
+ return '<font size="1">Page '.$_multipage['current_page'].' / '.$_multipage['nb_page'].'</font>';
+}
?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gu...@us...> - 2007-05-01 15:38:02
|
Revision: 141
http://svn.sourceforge.net/easybox-mod/?rev=141&view=rev
Author: guyou
Date: 2007-05-01 08:37:58 -0700 (Tue, 01 May 2007)
Log Message:
-----------
Ajout svn:eol-style=native sur fichiers .htm (#1699723)
Modified Paths:
--------------
trunk/module/agenda/export.htm
Property Changed:
----------------
trunk/module/agenda/export.htm
Modified: trunk/module/agenda/export.htm
===================================================================
--- trunk/module/agenda/export.htm 2007-05-01 15:30:32 UTC (rev 140)
+++ trunk/module/agenda/export.htm 2007-05-01 15:37:58 UTC (rev 141)
@@ -1,26 +1,26 @@
-<html>
-<center>
-<body>
-<b><u>Voici comment faire pour exporter vos \xE9l\xE9ments calendriers d'Outlook:</u></b><br>
-<br><u>Etape 1:</u> Tout d'abord, aller dans <i>"Fichiers -> Importer et exporter"</i> dans la baree de menu, comme suit:
-<br><img src="images/config/export1.gif"><br>
-<br><u>Etape 2:</u> Puis choisir <i>"Exporter des donn\xE9es vers un fichier"</i> dans la boite de dialogue:
-<br><img src="images/config/export2.gif"><br>
-<br><u>Etape 3:</u> Ensuite, choisir <i>"Valeurs s\xE9par\xE9es par des virgules"</i> dans la boite de dialogue:
-<br><img src="images/config/export3.gif"><br>
-<br><u>Etape 4:</u> Choisir d'exporter le <i>"Calendrier"</i>:
-<br><img src="images/config/export4.gif"><br>
-<br><u>Etape 5:</u> Choisir le dossier de destination qui contiendra le fichier exporter.<br>
-Vous pouvez soit choisir un dossier que vous voulez, soit le mettre dans le dossier pr\xE9d\xE9finie dans le module,<br>
-correspondant au chemin suivant:<i>"C:\Program Files\EasyBox\http\module\agenda\fichiers"</i> puis nommer votre fichier.<br>
-<b>ATTENTION:Il est important de bien noter le chemin du dossier, ainsi que le nom du fichier, car ils seront utiles lors<br>
-de la configuration du module</b>:
-<br><img src="images/config/export5.gif"><br>
-<br><u>Etape 6:</u> Enfin cliquez sur le bouton <i>"Terminer"</i>:
-<br><img src="images/config/export6.gif"><br>
-<br><u>Etape 7:</u> D\xE9finir une fourchette de dates:
-<br><img src="images/config/export7.gif"><br>
-<br><b><u>FIN:</u> Il ne vous reste plus qu'\xE0 configurer le module et le tour est jou\xE9, bonne utilisation!!!</b>
-</body>
-</center>
+<html>
+<center>
+<body>
+<b><u>Voici comment faire pour exporter vos \xE9l\xE9ments calendriers d'Outlook:</u></b><br>
+<br><u>Etape 1:</u> Tout d'abord, aller dans <i>"Fichiers -> Importer et exporter"</i> dans la baree de menu, comme suit:
+<br><img src="images/config/export1.gif"><br>
+<br><u>Etape 2:</u> Puis choisir <i>"Exporter des donn\xE9es vers un fichier"</i> dans la boite de dialogue:
+<br><img src="images/config/export2.gif"><br>
+<br><u>Etape 3:</u> Ensuite, choisir <i>"Valeurs s\xE9par\xE9es par des virgules"</i> dans la boite de dialogue:
+<br><img src="images/config/export3.gif"><br>
+<br><u>Etape 4:</u> Choisir d'exporter le <i>"Calendrier"</i>:
+<br><img src="images/config/export4.gif"><br>
+<br><u>Etape 5:</u> Choisir le dossier de destination qui contiendra le fichier exporter.<br>
+Vous pouvez soit choisir un dossier que vous voulez, soit le mettre dans le dossier pr\xE9d\xE9finie dans le module,<br>
+correspondant au chemin suivant:<i>"C:\Program Files\EasyBox\http\module\agenda\fichiers"</i> puis nommer votre fichier.<br>
+<b>ATTENTION:Il est important de bien noter le chemin du dossier, ainsi que le nom du fichier, car ils seront utiles lors<br>
+de la configuration du module</b>:
+<br><img src="images/config/export5.gif"><br>
+<br><u>Etape 6:</u> Enfin cliquez sur le bouton <i>"Terminer"</i>:
+<br><img src="images/config/export6.gif"><br>
+<br><u>Etape 7:</u> D\xE9finir une fourchette de dates:
+<br><img src="images/config/export7.gif"><br>
+<br><b><u>FIN:</u> Il ne vous reste plus qu'\xE0 configurer le module et le tour est jou\xE9, bonne utilisation!!!</b>
+</body>
+</center>
</html>
\ No newline at end of file
Property changes on: trunk/module/agenda/export.htm
___________________________________________________________________
Name: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gu...@us...> - 2007-05-01 15:30:34
|
Revision: 140
http://svn.sourceforge.net/easybox-mod/?rev=140&view=rev
Author: guyou
Date: 2007-05-01 08:30:32 -0700 (Tue, 01 May 2007)
Log Message:
-----------
Ajout svn:eol-style=native sur fichiers .html (#1699723)
Modified Paths:
--------------
trunk/http-vlc/lecteur/chap.html
trunk/http-vlc/lecteur/modif-config.html
trunk/http-vlc/lecteur/options_vlc.html
trunk/http-vlc/lecteur/play-low.html
trunk/http-vlc/lecteur/play.html
trunk/http-vlc/lecteur/set_option.html
trunk/http-vlc/module/mp3/lecteuraudio.html
trunk/http-vlc/status.html
trunk/module/freeboxtv/faq.html
trunk/module/freeboxtv/index.html
trunk/settings.html
trunk/status.html
trunk/version.html
Property Changed:
----------------
trunk/http-vlc/_framework/vlc/temps2.html
trunk/http-vlc/lecteur/action.html
trunk/http-vlc/lecteur/chap.html
trunk/http-vlc/lecteur/modif-config.html
trunk/http-vlc/lecteur/options_vlc.html
trunk/http-vlc/lecteur/play-low.html
trunk/http-vlc/lecteur/play-wifi.html
trunk/http-vlc/lecteur/play.html
trunk/http-vlc/lecteur/set_option.html
trunk/http-vlc/module/mp3/lecteuraudio.html
trunk/http-vlc/status.html
trunk/index1.html
trunk/module/freeboxtv/faq.html
trunk/module/freeboxtv/index.html
trunk/module/freeboxtv/result.html
trunk/settings.html
trunk/status.html
trunk/version.html
Property changes on: trunk/http-vlc/_framework/vlc/temps2.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/http-vlc/lecteur/action.html
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/http-vlc/lecteur/chap.html
===================================================================
--- trunk/http-vlc/lecteur/chap.html 2007-05-01 15:26:59 UTC (rev 139)
+++ trunk/http-vlc/lecteur/chap.html 2007-05-01 15:30:32 UTC (rev 140)
@@ -1,21 +1,21 @@
-<vlc id="foreach" param1="cat" param2="audio-es" />
- $audio[<vlc id="value" param1="cat.id" />] = array('<vlc id="value" param1="cat.name value htmlspecialchars" />', '<vlc id="if" param1="cat.selected 1 =" />1<vlc id="else" />0<vlc id="end" />');
-<vlc id="end" />
-
-
-<vlc id="foreach" param1="cat" param2="spu-es" />
- $sstitre[<vlc id="value" param1="cat.id" />] = array('<vlc id="value" param1="cat.name value htmlspecialchars" />', '<vlc id="if" param1="cat.selected 1 =" />1<vlc id="else" />0<vlc id="end" />');
-<vlc id="end" />
-
-
-<vlc id="foreach" param1="cat" param2="chapter" />
- $chapitre[<vlc id="value" param1="cat.id" />] = array('<vlc id="value" param1="cat.name value htmlspecialchars" />', '<vlc id="if" param1="cat.selected 1 =" />1<vlc id="else" />0<vlc id="end" />');
-<vlc id="end" />
-
-<vlc id="foreach" param1="cat" param2="title" />
- $titre[<vlc id="value" param1="cat.id" />] = array('<vlc id="value" param1="cat.name value htmlspecialchars" />', '<vlc id="if" param1="cat.selected 1 =" />1<vlc id="else" />0<vlc id="end" />');
-<vlc id="end" />
-
-$fontcolor[<vlc id="value" param1="'freetype-color' vlc_config_get"><vlc id="end" />];
-
-$fontsize[<vlc id="value" param1="'freetype-fontsize' vlc_config_get"><vlc id="end" />];
+<vlc id="foreach" param1="cat" param2="audio-es" />
+ $audio[<vlc id="value" param1="cat.id" />] = array('<vlc id="value" param1="cat.name value htmlspecialchars" />', '<vlc id="if" param1="cat.selected 1 =" />1<vlc id="else" />0<vlc id="end" />');
+<vlc id="end" />
+
+
+<vlc id="foreach" param1="cat" param2="spu-es" />
+ $sstitre[<vlc id="value" param1="cat.id" />] = array('<vlc id="value" param1="cat.name value htmlspecialchars" />', '<vlc id="if" param1="cat.selected 1 =" />1<vlc id="else" />0<vlc id="end" />');
+<vlc id="end" />
+
+
+<vlc id="foreach" param1="cat" param2="chapter" />
+ $chapitre[<vlc id="value" param1="cat.id" />] = array('<vlc id="value" param1="cat.name value htmlspecialchars" />', '<vlc id="if" param1="cat.selected 1 =" />1<vlc id="else" />0<vlc id="end" />');
+<vlc id="end" />
+
+<vlc id="foreach" param1="cat" param2="title" />
+ $titre[<vlc id="value" param1="cat.id" />] = array('<vlc id="value" param1="cat.name value htmlspecialchars" />', '<vlc id="if" param1="cat.selected 1 =" />1<vlc id="else" />0<vlc id="end" />');
+<vlc id="end" />
+
+$fontcolor[<vlc id="value" param1="'freetype-color' vlc_config_get"><vlc id="end" />];
+
+$fontsize[<vlc id="value" param1="'freetype-fontsize' vlc_config_get"><vlc id="end" />];
Property changes on: trunk/http-vlc/lecteur/chap.html
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/http-vlc/lecteur/modif-config.html
===================================================================
--- trunk/http-vlc/lecteur/modif-config.html 2007-05-01 15:26:59 UTC (rev 139)
+++ trunk/http-vlc/lecteur/modif-config.html 2007-05-01 15:30:32 UTC (rev 140)
@@ -1,77 +1,77 @@
-<vlc id="rpn" param1="type 'type' url_extract store"/>
-<vlc id="rpn" param1="type2 'type2' url_extract store"/>
-<vlc id="rpn" param1="valeur 'value' url_extract store"/>
-<vlc id="rpn" param1="variable 'var' url_extract store"/>
-
- <!-- Modification de la sortie Audio - Type 0 -->
- <vlc id="if" param1="type value 0 =" />
- <vlc id="rpn" param1="valeur value variable value vlc_config_set"/>
- <vlc id="end" />
-
- <!-- Modification du mode de lecture - Type 1 -->
- <vlc id="if" param1="type value 1 =" />
- <vlc id="rpn" param1="valeur value variable value 'VLC_OBJECT_PLAYLIST' vlc_var_set"/>
- <vlc id="end" />
-
- <!-- Modification des obtions audio, sous-titre, titre et chapitre - Type 2 -->
- <vlc id="if" param1="type value 2 =" />
- <!-- CHANGE LA LANGUES AUDIO - Type2 = 1 -->
- <vlc id="if" param1="type2 value 1 =" />
- <vlc id="rpn" param1="'valeur' value 'audio-es' 'VLC_OBJECT_INPUT' vlc_var_set" />
- <vlc id="end" />
- <!-- CHANGE LES OPTIONS SOUS-TITRES - Type2 = 2 -->
- <vlc id="if" param1="type2 value 2 =" />
-
- <vlc id="rpn" param1="sub_margin 'sub_margin' url_extract store" />
- <vlc id="if" param1="sub_margin value '' strcmp 0 !=" />
- <vlc id="rpn" param1="sub_margin value 'sub-margin' vlc_config_set" />
- <vlc id="end" />
-
- <vlc id="rpn" param1="size 'size' url_extract store" />
- <vlc id="if" param1="size value '' strcmp 0 !=" />
- <vlc id="rpn" param1="size value 'freetype-fontsize' vlc_config_set" />
- <vlc id="end" />
-
- <vlc id="rpn" param1="color 'color' url_extract store" />
- <vlc id="if" param1="color value '' strcmp 0 !=" />
- <vlc id="rpn" param1="color value 'freetype-color' vlc_config_set" />
- <vlc id="end" />
-
- <vlc id="rpn" param1="vlc_config_save" />
-
- <vlc id="end" />
-
- <!-- CHANGE DE SSTITRE - Type2 = 3 -->
- <vlc id="if" param1="type2 value 3 =" />
- <vlc id="rpn" param1="'valeur' value 'spu-es' 'VLC_OBJECT_INPUT' vlc_var_set" />
- <vlc id="end" />
-
- <!-- CHANGE DE CHAPITRE - Type2 = 4 -->
- <vlc id="if" param1="type2 value 4 =" />
- <vlc id="rpn" param1="'valeur' value 'chapter' 'VLC_OBJECT_INPUT' vlc_var_set" />
- <vlc id="end" />
-
- <!-- CHANGE DE TITRE - Type2 = 5 -->
- <vlc id="if" param1="type2 value 5 =" />
- <vlc id="rpn" param1="'valeur' value 'title' 'VLC_OBJECT_INPUT' vlc_var_set" />
- <vlc id="end" />
-
- <vlc id="end" />
-
-
-
- <!-- Modification de la video - Type 3 -->
- <vlc id="if" param1="type value 3 =" />
- <vlc id="rpn" param1="video 'video' url_extract store" />
-
- <vlc id="if" param1="video value '' strcmp 0 !=" />
- <vlc id="rpn" param1="video value 'video-es' 'VLC_OBJECT_INPUT' vlc_var_set" />
- <vlc id="end" />
-
- <vlc id="rpn" param1="pp 'pp' url_extract store" />
- <vlc id="if" param1="pp value '' strcmp 0 !=" />
- <vlc id="rpn" param1="pp value 'ffmpeg-pp-q' vlc_config_set" />
- <vlc id="rpn" param1="vlc_config_save" />
- <vlc id="end" />
- <vlc id="end" />
-
+<vlc id="rpn" param1="type 'type' url_extract store"/>
+<vlc id="rpn" param1="type2 'type2' url_extract store"/>
+<vlc id="rpn" param1="valeur 'value' url_extract store"/>
+<vlc id="rpn" param1="variable 'var' url_extract store"/>
+
+ <!-- Modification de la sortie Audio - Type 0 -->
+ <vlc id="if" param1="type value 0 =" />
+ <vlc id="rpn" param1="valeur value variable value vlc_config_set"/>
+ <vlc id="end" />
+
+ <!-- Modification du mode de lecture - Type 1 -->
+ <vlc id="if" param1="type value 1 =" />
+ <vlc id="rpn" param1="valeur value variable value 'VLC_OBJECT_PLAYLIST' vlc_var_set"/>
+ <vlc id="end" />
+
+ <!-- Modification des obtions audio, sous-titre, titre et chapitre - Type 2 -->
+ <vlc id="if" param1="type value 2 =" />
+ <!-- CHANGE LA LANGUES AUDIO - Type2 = 1 -->
+ <vlc id="if" param1="type2 value 1 =" />
+ <vlc id="rpn" param1="'valeur' value 'audio-es' 'VLC_OBJECT_INPUT' vlc_var_set" />
+ <vlc id="end" />
+ <!-- CHANGE LES OPTIONS SOUS-TITRES - Type2 = 2 -->
+ <vlc id="if" param1="type2 value 2 =" />
+
+ <vlc id="rpn" param1="sub_margin 'sub_margin' url_extract store" />
+ <vlc id="if" param1="sub_margin value '' strcmp 0 !=" />
+ <vlc id="rpn" param1="sub_margin value 'sub-margin' vlc_config_set" />
+ <vlc id="end" />
+
+ <vlc id="rpn" param1="size 'size' url_extract store" />
+ <vlc id="if" param1="size value '' strcmp 0 !=" />
+ <vlc id="rpn" param1="size value 'freetype-fontsize' vlc_config_set" />
+ <vlc id="end" />
+
+ <vlc id="rpn" param1="color 'color' url_extract store" />
+ <vlc id="if" param1="color value '' strcmp 0 !=" />
+ <vlc id="rpn" param1="color value 'freetype-color' vlc_config_set" />
+ <vlc id="end" />
+
+ <vlc id="rpn" param1="vlc_config_save" />
+
+ <vlc id="end" />
+
+ <!-- CHANGE DE SSTITRE - Type2 = 3 -->
+ <vlc id="if" param1="type2 value 3 =" />
+ <vlc id="rpn" param1="'valeur' value 'spu-es' 'VLC_OBJECT_INPUT' vlc_var_set" />
+ <vlc id="end" />
+
+ <!-- CHANGE DE CHAPITRE - Type2 = 4 -->
+ <vlc id="if" param1="type2 value 4 =" />
+ <vlc id="rpn" param1="'valeur' value 'chapter' 'VLC_OBJECT_INPUT' vlc_var_set" />
+ <vlc id="end" />
+
+ <!-- CHANGE DE TITRE - Type2 = 5 -->
+ <vlc id="if" param1="type2 value 5 =" />
+ <vlc id="rpn" param1="'valeur' value 'title' 'VLC_OBJECT_INPUT' vlc_var_set" />
+ <vlc id="end" />
+
+ <vlc id="end" />
+
+
+
+ <!-- Modification de la video - Type 3 -->
+ <vlc id="if" param1="type value 3 =" />
+ <vlc id="rpn" param1="video 'video' url_extract store" />
+
+ <vlc id="if" param1="video value '' strcmp 0 !=" />
+ <vlc id="rpn" param1="video value 'video-es' 'VLC_OBJECT_INPUT' vlc_var_set" />
+ <vlc id="end" />
+
+ <vlc id="rpn" param1="pp 'pp' url_extract store" />
+ <vlc id="if" param1="pp value '' strcmp 0 !=" />
+ <vlc id="rpn" param1="pp value 'ffmpeg-pp-q' vlc_config_set" />
+ <vlc id="rpn" param1="vlc_config_save" />
+ <vlc id="end" />
+ <vlc id="end" />
+
Property changes on: trunk/http-vlc/lecteur/modif-config.html
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/http-vlc/lecteur/options_vlc.html
===================================================================
--- trunk/http-vlc/lecteur/options_vlc.html 2007-05-01 15:26:59 UTC (rev 139)
+++ trunk/http-vlc/lecteur/options_vlc.html 2007-05-01 15:30:32 UTC (rev 140)
@@ -1,30 +1,30 @@
-<vlc id="foreach" param1="cat" param2="video-es" />
- $video[<vlc id="value" param1="cat.id" />] = array('<vlc id="value" param1="cat.name value htmlspecialchars" />', '<vlc id="if" param1="cat.selected 1 =" />1<vlc id="else" />0<vlc id="end" />');
-<vlc id="end" />
-
-
-<vlc id="foreach" param1="cat" param2="audio-es" />
- $audio[<vlc id="value" param1="cat.id" />] = array('<vlc id="value" param1="cat.name value htmlspecialchars" />', '<vlc id="if" param1="cat.selected 1 =" />1<vlc id="else" />0<vlc id="end" />');
-<vlc id="end" />
-
-
-<vlc id="foreach" param1="cat" param2="spu-es" />
- $sstitre[<vlc id="value" param1="cat.id" />] = array('<vlc id="value" param1="cat.name value htmlspecialchars" />', '<vlc id="if" param1="cat.selected 1 =" />1<vlc id="else" />0<vlc id="end" />');
-<vlc id="end" />
-
-
-<vlc id="foreach" param1="cat" param2="chapter" />
- $chapitre[<vlc id="value" param1="cat.id" />] = array('<vlc id="value" param1="cat.name value htmlspecialchars" />', '<vlc id="if" param1="cat.selected 1 =" />1<vlc id="else" />0<vlc id="end" />');
-<vlc id="end" />
-
-
-<vlc id="foreach" param1="cat" param2="title" />
- $title[<vlc id="value" param1="cat.id" />] = array('<vlc id="value" param1="cat.name value htmlspecialchars" />', '<vlc id="if" param1="cat.selected 1 =" />1<vlc id="else" />0<vlc id="end" />');
-<vlc id="end" />
-
-
-$pp_video[<vlc id="value" param1="pp 'ffmpeg-pp-q' vlc_config_get"><vlc id="end" />] = "1";
-$fontcolor[<vlc id="value" param1="'freetype-color' vlc_config_get"><vlc id="end" />] = "1";
-$ffontsize[<vlc id="value" param1="'freetype-fontsize' vlc_config_get"><vlc id="end" />] = "1";
-$sub_margin[<vlc id="value" param1="'sub-margin' vlc_config_get"><vlc id="end" />] = "1";
-
+<vlc id="foreach" param1="cat" param2="video-es" />
+ $video[<vlc id="value" param1="cat.id" />] = array('<vlc id="value" param1="cat.name value htmlspecialchars" />', '<vlc id="if" param1="cat.selected 1 =" />1<vlc id="else" />0<vlc id="end" />');
+<vlc id="end" />
+
+
+<vlc id="foreach" param1="cat" param2="audio-es" />
+ $audio[<vlc id="value" param1="cat.id" />] = array('<vlc id="value" param1="cat.name value htmlspecialchars" />', '<vlc id="if" param1="cat.selected 1 =" />1<vlc id="else" />0<vlc id="end" />');
+<vlc id="end" />
+
+
+<vlc id="foreach" param1="cat" param2="spu-es" />
+ $sstitre[<vlc id="value" param1="cat.id" />] = array('<vlc id="value" param1="cat.name value htmlspecialchars" />', '<vlc id="if" param1="cat.selected 1 =" />1<vlc id="else" />0<vlc id="end" />');
+<vlc id="end" />
+
+
+<vlc id="foreach" param1="cat" param2="chapter" />
+ $chapitre[<vlc id="value" param1="cat.id" />] = array('<vlc id="value" param1="cat.name value htmlspecialchars" />', '<vlc id="if" param1="cat.selected 1 =" />1<vlc id="else" />0<vlc id="end" />');
+<vlc id="end" />
+
+
+<vlc id="foreach" param1="cat" param2="title" />
+ $title[<vlc id="value" param1="cat.id" />] = array('<vlc id="value" param1="cat.name value htmlspecialchars" />', '<vlc id="if" param1="cat.selected 1 =" />1<vlc id="else" />0<vlc id="end" />');
+<vlc id="end" />
+
+
+$pp_video[<vlc id="value" param1="pp 'ffmpeg-pp-q' vlc_config_get"><vlc id="end" />] = "1";
+$fontcolor[<vlc id="value" param1="'freetype-color' vlc_config_get"><vlc id="end" />] = "1";
+$ffontsize[<vlc id="value" param1="'freetype-fontsize' vlc_config_get"><vlc id="end" />] = "1";
+$sub_margin[<vlc id="value" param1="'sub-margin' vlc_config_get"><vlc id="end" />] = "1";
+
Property changes on: trunk/http-vlc/lecteur/options_vlc.html
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/http-vlc/lecteur/play-low.html
===================================================================
--- trunk/http-vlc/lecteur/play-low.html 2007-05-01 15:26:59 UTC (rev 139)
+++ trunk/http-vlc/lecteur/play-low.html 2007-05-01 15:30:32 UTC (rev 140)
@@ -1,167 +1,167 @@
-<!-- R\xE9cup\xE9ration des variables -->
-<vlc id="rpn" param1="mrl 'mrl' url_extract store" />
-<vlc id="rpn" param1="type 'type' url_extract store" />
-<vlc id="rpn" param1="qfile '\'' mrl value strcat '\'' strcat store" />
-
-<!-- Fichiers vid\xE9os -->
-<!-- audio/video Lecture d'un fichier dans la playlist - Type 0 -->
- <vlc id="if" param1="type value 0 =" />
- <vlc id="rpn" param1="mrl value vlc_play" />
- <vlc id="end" />
-
-<!-- audio/video jou\xE9 et transcod\xE9 normalement TV - Type 1 -->
- <vlc id="if" param1="type value 1 =" />
- <vlc id="rpn" param1="vlc_stop" />
- <vlc id="rpn" param1="playlist_empty" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=1024 :sout-transcode-acodec=mpga :sout-transcode-ab=128 :sout-transcode-channels=2 :sout-transcode-samplerate=0 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay :sout-transcode-scale=0.65' strcat mrl value playlist_add vlc_play" />
- <vlc id="end" />
-
-<!-- audio/video ajout\xE9 et transcod\xE9 normalement TV - Type 2 -->
- <vlc id="if" param1="type value 2 =" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=1024 :sout-transcode-acodec=mpga :sout-transcode-ab=128 :sout-transcode-channels=2 :sout-transcode-samplerate=0 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay :sout-transcode-scale=0.65' strcat mrl value playlist_add" />
- <vlc id="end" />
-
-<!-- audio/video jou\xE9 et transcod\xE9 avec sortie sur PC - Type 3 -->
- <vlc id="if" param1="type value 3 =" />
- <vlc id="rpn" param1="vlc_stop" />
- <vlc id="rpn" param1="playlist_empty" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout=#duplicate{dst=transcode:std,select=video,dst=display,select=audio} :sout-transcode-vcodec=mp2v :sout-transcode-vb=1024 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=0 :sout-transcode-ab=128 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay :sout-transcode-scale=0.65' strcat mrl value playlist_add vlc_play" />
- <vlc id="end" />
-
-<!-- audio/video ajout\xE9 et transcod\xE9 avec sortie sur PC - Type 4 -->
- <vlc id="if" param1="type value 4 =" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout=#duplicate{dst=transcode:std,select=video,dst=display,select=audio} :sout-transcode-vcodec=mp2v :sout-transcode-vb=1024 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=0 :sout-transcode-ab=128 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay :sout-transcode-scale=0.65' strcat mrl value playlist_add" />
- <vlc id="end" />
-
-<!-- audio/video jou\xE9 et transcod\xE9 avec sortie en AC3 - Type 5 -->
- <vlc id="if" param1="type value 5 =" />
- <vlc id="rpn" param1="vlc_stop" />
- <vlc id="rpn" param1="playlist_empty" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=1024 :sout-transcode-ab=128 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=0 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay :sout-transcode-scale=0.65' strcat mrl value playlist_add vlc_play" />
- <vlc id="end" />
-
-<!-- audio/video ajout\xE9 et transcod\xE9 avec sortie en AC3 - Type 6 -->
- <vlc id="if" param1="type value 6 =" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=1024 :sout-transcode-ab=128 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=0 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay :sout-transcode-scale=0.65' strcat mrl value playlist_add" />
- <vlc id="end" />
-
-<!-- messagerie audio - Type 7 -->
- <vlc id="if" param1="type value 7 =" />
- <vlc id="rpn" param1="vlc_stop" />
- <vlc id="rpn" param1="playlist_empty" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=128 :sout-transcode-acodec=mpga :sout-transcode-channels=2 :sout-transcode-samplerate=0' strcat mrl value playlist_add vlc_play" />
- <vlc id="end" />
-
-<!-- Fichiers photos -->
-
-<!-- photo jouee normalement - Type 20 -->
- <vlc id="if" param1="type value 20 =" />
- <vlc id="rpn" param1="0 loop 'VLC_OBJECT_PLAYLIST' vlc_var_set"/>
- <vlc id="rpn" param1="0 random 'VLC_OBJECT_PLAYLIST' vlc_var_set"/>
- <vlc id="rpn" param1="0 repeat 'VLC_OBJECT_PLAYLIST' vlc_var_set"/>
- <vlc id="rpn" param1="vlc_stop" />
- <vlc id="rpn" param1="playlist_empty" />
- <vlc id="rpn" param1="'temps' url_extract 'fake-duration' vlc_config_set" />
- <vlc id="rpn" param1="'fake: :sout=#transcode:std :sout-transcode-vb=2048 :sout-transcode-vt=1000000 :sout-transcode-vcodec=mp2v :fake-width=720 :fake-height=576 :fake-aspect-ratio=4:3 :fake-duration=4000 :sout-udp-caching=100 :fake-file=' mrl value strcat mrl value playlist_add vlc_play" />
- <vlc id="end" />
-
-
-<!-- photo ajoutee normalement - Type 21 -->
- <vlc id="if" param1="type value 21 =" />
- <vlc id="rpn" param1="0 loop 'VLC_OBJECT_PLAYLIST' vlc_var_set"/>
- <vlc id="rpn" param1="0 random 'VLC_OBJECT_PLAYLIST' vlc_var_set"/>
- <vlc id="rpn" param1="0 repeat 'VLC_OBJECT_PLAYLIST' vlc_var_set"/>
- <vlc id="rpn" param1="'temps' url_extract 'fake-duration' vlc_config_set" />
- <vlc id="rpn" param1="'fake: :sout=#transcode:std :sout-transcode-vb=2048 :sout-transcode-vt=1000000 :sout-transcode-vcodec=mp2v :fake-width=720 :fake-height=576 :fake-aspect-ratio=4:3 :fake-duration=4000 :sout-udp-caching=100 :fake-file=' mrl value strcat mrl value playlist_add" />
- <vlc id="end" />
-
-
-<!-- playlist de photo jou\xE9e normalement - Type 22 -->
- <vlc id="if" param1="type value 22 =" />
- <vlc id="rpn" param1="vlc_stop" />
- <vlc id="rpn" param1="playlist_empty" />
- <vlc id="rpn" param1="0 loop 'VLC_OBJECT_PLAYLIST' vlc_var_set"/>
- <vlc id="rpn" param1="0 random 'VLC_OBJECT_PLAYLIST' vlc_var_set"/>
- <vlc id="rpn" param1="0 repeat 'VLC_OBJECT_PLAYLIST' vlc_var_set"/>
- <vlc id="rpn" param1="'temps' url_extract 'fake-duration' vlc_config_set" />
- <vlc id="rpn" param1="qfile value mrl value playlist_add vlc_play" />
- <vlc id="end" />
-
-<!-- playlist de photo ajout\xE9e normalement - Type 23 -->
- <vlc id="if" param1="type value 23 =" />
- <vlc id="rpn" param1="0 loop 'VLC_OBJECT_PLAYLIST' vlc_var_set"/>
- <vlc id="rpn" param1="0 random 'VLC_OBJECT_PLAYLIST' vlc_var_set"/>
- <vlc id="rpn" param1="0 repeat 'VLC_OBJECT_PLAYLIST' vlc_var_set"/>
- <vlc id="rpn" param1="'temps' url_extract 'fake-duration' vlc_config_set" />
- <vlc id="rpn" param1="qfile value mrl value playlist_add" />
- <vlc id="end" />
-
-
-<!-- DVDs -->
-
-<!-- dvd jou\xE9 normalement - transcodage audio - Type 30 -->
- <vlc id="if" param1="type value 30 =" />
- <vlc id="rpn" param1="vlc_stop" />
- <vlc id="rpn" param1="playlist_empty" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=128 :sout-transcode-acodec=mpga :sout-transcode-channels=2 :sout-transcode-samplerate=0 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add vlc_play" />
- <vlc id="end" />
-
-<!-- dvd jou\xE9 normalement - sortie audio PC - Type 31 -->
- <vlc id="if" param1="type value 31 =" />
- <vlc id="rpn" param1="vlc_stop" />
- <vlc id="rpn" param1="playlist_empty" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout=#duplicate{dst=transcode:std,select=video,dst=display,select=audio} :sout-transcode-ab=128 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=0 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add vlc_play" />
- <vlc id="end" />
-
-<!-- dvd jou\xE9 normalement - Sortie AC3 audio - Type 32 -->
- <vlc id="if" param1="type value 32 =" />
- <vlc id="rpn" param1="vlc_stop" />
- <vlc id="rpn" param1="playlist_empty" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=128 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=0 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add vlc_play" />
- <vlc id="end" />
-
-<!-- dvd ajout\xE9 normalement - transcodage audio - Type 33 -->
- <vlc id="if" param1="type value 33 =" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=128 :sout-transcode-acodec=mpga :sout-transcode-channels=2 :sout-transcode-samplerate=0 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add" />
- <vlc id="end" />
-
-<!-- dvd ajout\xE9 normalement - sortie audio PC - Type 34 -->
- <vlc id="if" param1="type value 34 =" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout=#duplicate{dst=transcode:std,select=video,dst=display,select=audio} :sout-transcode-ab=128 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=0 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add" />
- <vlc id="end" />
-
-<!-- dvd ajout\xE9 normalement - Sortie AC3 audio - Type 35 -->
- <vlc id="if" param1="type value 35 =" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=128 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=0 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add" />
- <vlc id="end" />
-
-<!-- MMS -->
-
-<!-- MMS - Sortie TV - Type 40 -->
- <vlc id="if" param1="type value 40 =" />
- <vlc id="rpn" param1="vlc_stop" />
- <vlc id="rpn" param1="playlist_empty" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=1024 :sout-transcode-acodec=mpga :sout-transcode-ab=128 :sout-transcode-channels=2 :sout-transcode-samplerate=44100 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :sout-transcode-soverlay :mms-caching=1000 :http-caching=1000 :http-reconnect' strcat mrl value playlist_add vlc_play" />
- <vlc id="end" />
-
-<!-- MMS - Sortie PC - Type 41 -->
- <vlc id="if" param1="type value 41 =" />
- <vlc id="rpn" param1="vlc_stop" />
- <vlc id="rpn" param1="playlist_empty" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout=#duplicate{dst=transcode:std,select=video,dst=display,select=audio} :sout-transcode-vcodec=mp2v :sout-transcode-vb=1024 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=44100 :sout-transcode-ab=128 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay :mms-caching=1000 :http-caching=1000 :http-reconnect' strcat mrl value playlist_add vlc_play" />
- <vlc id="end" />
-
-<!-- MMS - Sortie AC3 - Type 42 -->
- <vlc id="if" param1="type value 42 =" />
- <vlc id="rpn" param1="vlc_stop" />
- <vlc id="rpn" param1="playlist_empty" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=1024 :sout-transcode-ab=128 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=44100 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay :mms-caching=1000 :http-caching=1000 :http-reconnect' strcat mrl value playlist_add vlc_play" />
- <vlc id="end" />
-
-<!-- Vide la playlist - Type 999 -->
- <vlc id="if" param1="type value 999 =" />
- <vlc id="rpn" param1="vlc_stop" />
- <vlc id="rpn" param1="playlist_empty" />
- <vlc id="end" />
-
-
+<!-- R\xE9cup\xE9ration des variables -->
+<vlc id="rpn" param1="mrl 'mrl' url_extract store" />
+<vlc id="rpn" param1="type 'type' url_extract store" />
+<vlc id="rpn" param1="qfile '\'' mrl value strcat '\'' strcat store" />
+
+<!-- Fichiers vid\xE9os -->
+<!-- audio/video Lecture d'un fichier dans la playlist - Type 0 -->
+ <vlc id="if" param1="type value 0 =" />
+ <vlc id="rpn" param1="mrl value vlc_play" />
+ <vlc id="end" />
+
+<!-- audio/video jou\xE9 et transcod\xE9 normalement TV - Type 1 -->
+ <vlc id="if" param1="type value 1 =" />
+ <vlc id="rpn" param1="vlc_stop" />
+ <vlc id="rpn" param1="playlist_empty" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=1024 :sout-transcode-acodec=mpga :sout-transcode-ab=128 :sout-transcode-channels=2 :sout-transcode-samplerate=0 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay :sout-transcode-scale=0.65' strcat mrl value playlist_add vlc_play" />
+ <vlc id="end" />
+
+<!-- audio/video ajout\xE9 et transcod\xE9 normalement TV - Type 2 -->
+ <vlc id="if" param1="type value 2 =" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=1024 :sout-transcode-acodec=mpga :sout-transcode-ab=128 :sout-transcode-channels=2 :sout-transcode-samplerate=0 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay :sout-transcode-scale=0.65' strcat mrl value playlist_add" />
+ <vlc id="end" />
+
+<!-- audio/video jou\xE9 et transcod\xE9 avec sortie sur PC - Type 3 -->
+ <vlc id="if" param1="type value 3 =" />
+ <vlc id="rpn" param1="vlc_stop" />
+ <vlc id="rpn" param1="playlist_empty" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout=#duplicate{dst=transcode:std,select=video,dst=display,select=audio} :sout-transcode-vcodec=mp2v :sout-transcode-vb=1024 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=0 :sout-transcode-ab=128 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay :sout-transcode-scale=0.65' strcat mrl value playlist_add vlc_play" />
+ <vlc id="end" />
+
+<!-- audio/video ajout\xE9 et transcod\xE9 avec sortie sur PC - Type 4 -->
+ <vlc id="if" param1="type value 4 =" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout=#duplicate{dst=transcode:std,select=video,dst=display,select=audio} :sout-transcode-vcodec=mp2v :sout-transcode-vb=1024 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=0 :sout-transcode-ab=128 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay :sout-transcode-scale=0.65' strcat mrl value playlist_add" />
+ <vlc id="end" />
+
+<!-- audio/video jou\xE9 et transcod\xE9 avec sortie en AC3 - Type 5 -->
+ <vlc id="if" param1="type value 5 =" />
+ <vlc id="rpn" param1="vlc_stop" />
+ <vlc id="rpn" param1="playlist_empty" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=1024 :sout-transcode-ab=128 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=0 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay :sout-transcode-scale=0.65' strcat mrl value playlist_add vlc_play" />
+ <vlc id="end" />
+
+<!-- audio/video ajout\xE9 et transcod\xE9 avec sortie en AC3 - Type 6 -->
+ <vlc id="if" param1="type value 6 =" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=1024 :sout-transcode-ab=128 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=0 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay :sout-transcode-scale=0.65' strcat mrl value playlist_add" />
+ <vlc id="end" />
+
+<!-- messagerie audio - Type 7 -->
+ <vlc id="if" param1="type value 7 =" />
+ <vlc id="rpn" param1="vlc_stop" />
+ <vlc id="rpn" param1="playlist_empty" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=128 :sout-transcode-acodec=mpga :sout-transcode-channels=2 :sout-transcode-samplerate=0' strcat mrl value playlist_add vlc_play" />
+ <vlc id="end" />
+
+<!-- Fichiers photos -->
+
+<!-- photo jouee normalement - Type 20 -->
+ <vlc id="if" param1="type value 20 =" />
+ <vlc id="rpn" param1="0 loop 'VLC_OBJECT_PLAYLIST' vlc_var_set"/>
+ <vlc id="rpn" param1="0 random 'VLC_OBJECT_PLAYLIST' vlc_var_set"/>
+ <vlc id="rpn" param1="0 repeat 'VLC_OBJECT_PLAYLIST' vlc_var_set"/>
+ <vlc id="rpn" param1="vlc_stop" />
+ <vlc id="rpn" param1="playlist_empty" />
+ <vlc id="rpn" param1="'temps' url_extract 'fake-duration' vlc_config_set" />
+ <vlc id="rpn" param1="'fake: :sout=#transcode:std :sout-transcode-vb=2048 :sout-transcode-vt=1000000 :sout-transcode-vcodec=mp2v :fake-width=720 :fake-height=576 :fake-aspect-ratio=4:3 :fake-duration=4000 :sout-udp-caching=100 :fake-file=' mrl value strcat mrl value playlist_add vlc_play" />
+ <vlc id="end" />
+
+
+<!-- photo ajoutee normalement - Type 21 -->
+ <vlc id="if" param1="type value 21 =" />
+ <vlc id="rpn" param1="0 loop 'VLC_OBJECT_PLAYLIST' vlc_var_set"/>
+ <vlc id="rpn" param1="0 random 'VLC_OBJECT_PLAYLIST' vlc_var_set"/>
+ <vlc id="rpn" param1="0 repeat 'VLC_OBJECT_PLAYLIST' vlc_var_set"/>
+ <vlc id="rpn" param1="'temps' url_extract 'fake-duration' vlc_config_set" />
+ <vlc id="rpn" param1="'fake: :sout=#transcode:std :sout-transcode-vb=2048 :sout-transcode-vt=1000000 :sout-transcode-vcodec=mp2v :fake-width=720 :fake-height=576 :fake-aspect-ratio=4:3 :fake-duration=4000 :sout-udp-caching=100 :fake-file=' mrl value strcat mrl value playlist_add" />
+ <vlc id="end" />
+
+
+<!-- playlist de photo jou\xE9e normalement - Type 22 -->
+ <vlc id="if" param1="type value 22 =" />
+ <vlc id="rpn" param1="vlc_stop" />
+ <vlc id="rpn" param1="playlist_empty" />
+ <vlc id="rpn" param1="0 loop 'VLC_OBJECT_PLAYLIST' vlc_var_set"/>
+ <vlc id="rpn" param1="0 random 'VLC_OBJECT_PLAYLIST' vlc_var_set"/>
+ <vlc id="rpn" param1="0 repeat 'VLC_OBJECT_PLAYLIST' vlc_var_set"/>
+ <vlc id="rpn" param1="'temps' url_extract 'fake-duration' vlc_config_set" />
+ <vlc id="rpn" param1="qfile value mrl value playlist_add vlc_play" />
+ <vlc id="end" />
+
+<!-- playlist de photo ajout\xE9e normalement - Type 23 -->
+ <vlc id="if" param1="type value 23 =" />
+ <vlc id="rpn" param1="0 loop 'VLC_OBJECT_PLAYLIST' vlc_var_set"/>
+ <vlc id="rpn" param1="0 random 'VLC_OBJECT_PLAYLIST' vlc_var_set"/>
+ <vlc id="rpn" param1="0 repeat 'VLC_OBJECT_PLAYLIST' vlc_var_set"/>
+ <vlc id="rpn" param1="'temps' url_extract 'fake-duration' vlc_config_set" />
+ <vlc id="rpn" param1="qfile value mrl value playlist_add" />
+ <vlc id="end" />
+
+
+<!-- DVDs -->
+
+<!-- dvd jou\xE9 normalement - transcodage audio - Type 30 -->
+ <vlc id="if" param1="type value 30 =" />
+ <vlc id="rpn" param1="vlc_stop" />
+ <vlc id="rpn" param1="playlist_empty" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=128 :sout-transcode-acodec=mpga :sout-transcode-channels=2 :sout-transcode-samplerate=0 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add vlc_play" />
+ <vlc id="end" />
+
+<!-- dvd jou\xE9 normalement - sortie audio PC - Type 31 -->
+ <vlc id="if" param1="type value 31 =" />
+ <vlc id="rpn" param1="vlc_stop" />
+ <vlc id="rpn" param1="playlist_empty" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout=#duplicate{dst=transcode:std,select=video,dst=display,select=audio} :sout-transcode-ab=128 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=0 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add vlc_play" />
+ <vlc id="end" />
+
+<!-- dvd jou\xE9 normalement - Sortie AC3 audio - Type 32 -->
+ <vlc id="if" param1="type value 32 =" />
+ <vlc id="rpn" param1="vlc_stop" />
+ <vlc id="rpn" param1="playlist_empty" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=128 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=0 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add vlc_play" />
+ <vlc id="end" />
+
+<!-- dvd ajout\xE9 normalement - transcodage audio - Type 33 -->
+ <vlc id="if" param1="type value 33 =" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=128 :sout-transcode-acodec=mpga :sout-transcode-channels=2 :sout-transcode-samplerate=0 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add" />
+ <vlc id="end" />
+
+<!-- dvd ajout\xE9 normalement - sortie audio PC - Type 34 -->
+ <vlc id="if" param1="type value 34 =" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout=#duplicate{dst=transcode:std,select=video,dst=display,select=audio} :sout-transcode-ab=128 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=0 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add" />
+ <vlc id="end" />
+
+<!-- dvd ajout\xE9 normalement - Sortie AC3 audio - Type 35 -->
+ <vlc id="if" param1="type value 35 =" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=128 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=0 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add" />
+ <vlc id="end" />
+
+<!-- MMS -->
+
+<!-- MMS - Sortie TV - Type 40 -->
+ <vlc id="if" param1="type value 40 =" />
+ <vlc id="rpn" param1="vlc_stop" />
+ <vlc id="rpn" param1="playlist_empty" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=1024 :sout-transcode-acodec=mpga :sout-transcode-ab=128 :sout-transcode-channels=2 :sout-transcode-samplerate=44100 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :sout-transcode-soverlay :mms-caching=1000 :http-caching=1000 :http-reconnect' strcat mrl value playlist_add vlc_play" />
+ <vlc id="end" />
+
+<!-- MMS - Sortie PC - Type 41 -->
+ <vlc id="if" param1="type value 41 =" />
+ <vlc id="rpn" param1="vlc_stop" />
+ <vlc id="rpn" param1="playlist_empty" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout=#duplicate{dst=transcode:std,select=video,dst=display,select=audio} :sout-transcode-vcodec=mp2v :sout-transcode-vb=1024 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=44100 :sout-transcode-ab=128 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay :mms-caching=1000 :http-caching=1000 :http-reconnect' strcat mrl value playlist_add vlc_play" />
+ <vlc id="end" />
+
+<!-- MMS - Sortie AC3 - Type 42 -->
+ <vlc id="if" param1="type value 42 =" />
+ <vlc id="rpn" param1="vlc_stop" />
+ <vlc id="rpn" param1="playlist_empty" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=1024 :sout-transcode-ab=128 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=44100 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay :mms-caching=1000 :http-caching=1000 :http-reconnect' strcat mrl value playlist_add vlc_play" />
+ <vlc id="end" />
+
+<!-- Vide la playlist - Type 999 -->
+ <vlc id="if" param1="type value 999 =" />
+ <vlc id="rpn" param1="vlc_stop" />
+ <vlc id="rpn" param1="playlist_empty" />
+ <vlc id="end" />
+
+
Property changes on: trunk/http-vlc/lecteur/play-low.html
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/http-vlc/lecteur/play-wifi.html
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/http-vlc/lecteur/play.html
===================================================================
--- trunk/http-vlc/lecteur/play.html 2007-05-01 15:26:59 UTC (rev 139)
+++ trunk/http-vlc/lecteur/play.html 2007-05-01 15:30:32 UTC (rev 140)
@@ -1,164 +1,164 @@
-<!-- Recuperation des variables -->
-<vlc id="rpn" param1="mrl 'mrl' url_extract store" />
-<vlc id="rpn" param1="type 'type' url_extract store" />
-<vlc id="rpn" param1="qfile '\'' mrl value strcat '\'' strcat store" />
-
-<!-- Fichiers videos -->
-<!-- audio/video Lecture d'un fichier dans la playlist - Type 0 -->
- <vlc id="if" param1="type value 0 =" />
- <vlc id="rpn" param1="mrl value vlc_play" />
- <vlc id="end" />
-
-<!-- audio/video joue et transcode normalement TV - Type 1 -->
- <vlc id="if" param1="type value 1 =" />
- <vlc id="rpn" param1="vlc_stop" />
- <vlc id="rpn" param1="playlist_empty" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=4096 :sout-transcode-acodec=mpga :sout-transcode-ab=256 :sout-transcode-channels=2 :sout-transcode-samplerate=0 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay' strcat mrl value playlist_add vlc_play" />
- <vlc id="end" />
-
-<!-- audio/video ajoute et transcode normalement TV - Type 2 -->
- <vlc id="if" param1="type value 2 =" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=4096 :sout-transcode-acodec=mpga :sout-transcode-ab=256 :sout-transcode-channels=2 :sout-transcode-samplerate=0 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay' strcat mrl value playlist_add" />
- <vlc id="end" />
-
-<!-- audio/video joue et transcode avec sortie sur PC - Type 3 -->
- <vlc id="if" param1="type value 3 =" />
- <vlc id="rpn" param1="vlc_stop" />
- <vlc id="rpn" param1="playlist_empty" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout=#duplicate{dst=transcode:std,select=video,dst=display,select=audio} :sout-transcode-vcodec=mp2v :sout-transcode-vb=4096 :sout-transcode-acodec=a52 :sout-transcode-ab=512 :sout-transcode-channels=6 :sout-transcode-samplerate=0 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay' strcat mrl value playlist_add vlc_play" />
- <vlc id="end" />
-
-<!-- audio/video ajoute et transcode avec sortie sur PC - Type 4 -->
- <vlc id="if" param1="type value 4 =" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout=#duplicate{dst=transcode:std,select=video,dst=display,select=audio} :sout-transcode-vcodec=mp2v :sout-transcode-vb=4096 :sout-transcode-acodec=a52 :sout-transcode-ab=512 :sout-transcode-channels=6 :sout-transcode-samplerate=0 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay' strcat mrl value playlist_add" />
- <vlc id="end" />
-
-<!-- audio/video joue et transcode avec sortie en AC3 - Type 5 -->
- <vlc id="if" param1="type value 5 =" />
- <vlc id="rpn" param1="vlc_stop" />
- <vlc id="rpn" param1="playlist_empty" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=4096 :sout-transcode-ab=512 :sout-transcode-channels=6 :sout-transcode-acodec=a52 :sout-transcode-samplerate=0 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay' strcat mrl value playlist_add vlc_play" />
- <vlc id="end" />
-
-<!-- audio/video ajoute et transcode avec sortie en AC3 - Type 6 -->
- <vlc id="if" param1="type value 6 =" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=4096 :sout-transcode-ab=512 :sout-transcode-channels=6 :sout-transcode-acodec=a52 :sout-transcode-samplerate=0 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay' strcat mrl value playlist_add" />
- <vlc id="end" />
-
-<!-- messagerie audio - Type 7 -->
- <vlc id="if" param1="type value 7 =" />
- <vlc id="rpn" param1="vlc_stop" />
- <vlc id="rpn" param1="playlist_empty" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=256 :sout-transcode-acodec=mpga :sout-transcode-channels=2 :sout-transcode-samplerate=48000' strcat mrl value playlist_add vlc_play" />
- <vlc id="end" />
-
-<!-- Fichiers photos -->
-
-<!-- photo jouee normalement - Type 20 -->
- <vlc id="if" param1="type value 20 =" />
- <vlc id="rpn" param1="0 loop 'VLC_OBJECT_PLAYLIST' vlc_var_set"/>
- <vlc id="rpn" param1="0 random 'VLC_OBJECT_PLAYLIST' vlc_var_set"/>
- <vlc id="rpn" param1="0 repeat 'VLC_OBJECT_PLAYLIST' vlc_var_set"/>
- <vlc id="rpn" param1="vlc_stop" />
- <vlc id="rpn" param1="playlist_empty" />
- <vlc id="rpn" param1="'temps' url_extract 'fake-duration' vlc_config_set" />
- <vlc id="rpn" param1="'fake: :sout=#transcode:std :sout-transcode-vb=2048 :sout-transcode-vt=1000000 :sout-transcode-vcodec=mp2v :fake-width=720 :fake-height=576 :fake-aspect-ratio=4:3 :fake-duration=4000 :sout-udp-caching=100 :fake-file=' mrl value strcat mrl value playlist_add vlc_play" />
- <vlc id="end" />
-
-
-<!-- photo ajoutee normalement - Type 21 -->
- <vlc id="if" param1="type value 21 =" />
- <vlc id="rpn" param1="0 loop 'VLC_OBJECT_PLAYLIST' vlc_var_set"/>
- <vlc id="rpn" param1="0 random 'VLC_OBJECT_PLAYLIST' vlc_var_set"/>
- <vlc id="rpn" param1="0 repeat 'VLC_OBJECT_PLAYLIST' vlc_var_set"/>
- <vlc id="rpn" param1="'temps' url_extract 'fake-duration' vlc_config_set" />
- <vlc id="rpn" param1="'fake: :sout=#transcode:std :sout-transcode-vb=2048 :sout-transcode-vt=1000000 :sout-transcode-vcodec=mp2v :fake-width=720 :fake-height=576 :fake-aspect-ratio=4:3 :fake-duration=4000 :sout-udp-caching=100 :fake-file=' mrl value strcat mrl value playlist_add" />
- <vlc id="end" />
-
-
-<!-- playlist de photo jouee normalement - Type 22 -->
- <vlc id="if" param1="type value 22 =" />
- <vlc id="rpn" param1="vlc_stop" />
- <vlc id="rpn" param1="playlist_empty" />
- <vlc id="rpn" param1="0 loop 'VLC_OBJECT_PLAYLIST' vlc_var_set"/>
- <vlc id="rpn" param1="0 random 'VLC_OBJECT_PLAYLIST' vlc_var_set"/>
- <vlc id="rpn" param1="0 repeat 'VLC_OBJECT_PLAYLIST' vlc_var_set"/>
- <vlc id="rpn" param1="'temps' url_extract 'fake-duration' vlc_config_set" />
- <vlc id="rpn" param1="qfile value mrl value playlist_add vlc_play" />
- <vlc id="end" />
-
-<!-- playlist de photo ajoutee normalement - Type 23 -->
- <vlc id="if" param1="type value 23 =" />
- <vlc id="rpn" param1="0 loop 'VLC_OBJECT_PLAYLIST' vlc_var_set"/>
- <vlc id="rpn" param1="0 random 'VLC_OBJECT_PLAYLIST' vlc_var_set"/>
- <vlc id="rpn" param1="0 repeat 'VLC_OBJECT_PLAYLIST' vlc_var_set"/>
- <vlc id="rpn" param1="'temps' url_extract 'fake-duration' vlc_config_set" />
- <vlc id="rpn" param1="qfile value mrl value playlist_add" />
- <vlc id="end" />
-
-
-<!-- DVDs -->
-
-<!-- dvd joue normalement - transcodage audio - Type 30 -->
- <vlc id="if" param1="type value 30 =" />
- <vlc id="rpn" param1="vlc_stop" />
- <vlc id="rpn" param1="playlist_empty" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=256 :sout-transcode-acodec=mpga :sout-transcode-channels=2 :dvd-caching=500 :sout-udp-caching=300 :audio-language=fr :sout-transcode-vb=9600 :sout-transcode-vcodec=mp2v :sout=#transcode{scale=1,soverlay}:duplicate{dst=std{mux=ts}}' strcat mrl value playlist_add vlc_play" />
- <vlc id="end" />
-
-<!-- dvd joue normalement - sortie audio PC - Type 31 -->
- <vlc id="if" param1="type value 31 =" />
- <vlc id="rpn" param1="vlc_stop" />
- <vlc id="rpn" param1="playlist_empty" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=256 :sout-transcode-acodec=mpga :sout-transcode-channels=2 :dvd-caching=500 :sout-udp-caching=300 :audio-language=fr :sout-transcode-vb=9600 :sout-transcode-vcodec=mp2v :sout=#transcode{scale=1,soverlay}:duplicate{dst=std{mux=ts},select=video,dst=display,select=audio}' strcat mrl value playlist_add vlc_play" />
- <vlc id="end" />
-
-<!-- dvd joue normalement - Sortie AC3 audio - Type 32 -->
- <vlc id="if" param1="type value 32 =" />
- <vlc id="rpn" param1="vlc_stop" />
- <vlc id="rpn" param1="playlist_empty" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=512 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :dvd-caching=500 :sout-udp-caching=300 :audio-language=fr :sout-transcode-vb=9600 :sout-transcode-vcodec=mp2v :sout=#transcode{scale=1,soverlay}:duplicate{dst=std{mux=ts}}' strcat mrl value playlist_add vlc_play" />
- <vlc id="end" />
-
-<!-- dvd ajoute normalement - transcodage audio - Type 33 -->
- <vlc id="if" param1="type value 33 =" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=256 :sout-transcode-acodec=mpga :sout-transcode-channels=2 :sout-transcode-samplerate=0 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add" />
- <vlc id="end" />
-
-<!-- dvd ajoute normalement - sortie audio PC - Type 34 -->
- <vlc id="if" param1="type value 34 =" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout=#duplicate{dst=transcode:std,select=video,dst=display,select=audio} :sout-transcode-ab=512 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=0 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add" />
- <vlc id="end" />
-
-<!-- dvd ajoute normalement - Sortie AC3 audio - Type 35 -->
- <vlc id="if" param1="type value 35 =" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=512 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=0 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add" />
- <vlc id="end" />
-<!-- MMS -->
-
-<!-- MMS - Sortie TV - Type 40 -->
- <vlc id="if" param1="type value 40 =" />
- <vlc id="rpn" param1="vlc_stop" />
- <vlc id="rpn" param1="playlist_empty" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=4096 :sout-transcode-acodec=mpga :sout-transcode-ab=256 :sout-transcode-channels=2 :sout-transcode-samplerate=44100 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :sout-transcode-soverlay :mms-caching=1000 :http-caching=1000 :http-reconnect' strcat mrl value playlist_add vlc_play" />
- <vlc id="end" />
-
-<!-- MMS - Sortie PC - Type 41 -->
- <vlc id="if" param1="type value 41 =" />
- <vlc id="rpn" param1="vlc_stop" />
- <vlc id="rpn" param1="playlist_empty" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout=#duplicate{dst=transcode:std,select=video,dst=display,select=audio} :sout-transcode-vcodec=mp2v :sout-transcode-channels=6 :sout-transcode-samplerate=44100 :sout-transcode-vb=4096 :sout-transcode-acodec=mpga :sout-transcode-ab=512 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay :mms-caching=1000 :http-caching=1000 :http-reconnect' strcat mrl value playlist_add vlc_play" />
- <vlc id="end" />
-
-<!-- MMS - Sortie AC3 - Type 42 -->
- <vlc id="if" param1="type value 42 =" />
- <vlc id="rpn" param1="vlc_stop" />
- <vlc id="rpn" param1="playlist_empty" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=4096 :sout-transcode-ab=512 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=44100 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay :mms-caching=1000 :http-caching=1000 :http-reconnect' strcat mrl value playlist_add vlc_play" />
- <vlc id="end" />
-
-<!-- Vide la playlist - Type 999 -->
- <vlc id="if" param1="type value 999 =" />
- <vlc id="rpn" param1="vlc_stop" />
- <vlc id="rpn" param1="playlist_empty" />
- <vlc id="end" />
+<!-- Recuperation des variables -->
+<vlc id="rpn" param1="mrl 'mrl' url_extract store" />
+<vlc id="rpn" param1="type 'type' url_extract store" />
+<vlc id="rpn" param1="qfile '\'' mrl value strcat '\'' strcat store" />
+
+<!-- Fichiers videos -->
+<!-- audio/video Lecture d'un fichier dans la playlist - Type 0 -->
+ <vlc id="if" param1="type value 0 =" />
+ <vlc id="rpn" param1="mrl value vlc_play" />
+ <vlc id="end" />
+
+<!-- audio/video joue et transcode normalement TV - Type 1 -->
+ <vlc id="if" param1="type value 1 =" />
+ <vlc id="rpn" param1="vlc_stop" />
+ <vlc id="rpn" param1="playlist_empty" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=4096 :sout-transcode-acodec=mpga :sout-transcode-ab=256 :sout-transcode-channels=2 :sout-transcode-samplerate=0 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay' strcat mrl value playlist_add vlc_play" />
+ <vlc id="end" />
+
+<!-- audio/video ajoute et transcode normalement TV - Type 2 -->
+ <vlc id="if" param1="type value 2 =" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=4096 :sout-transcode-acodec=mpga :sout-transcode-ab=256 :sout-transcode-channels=2 :sout-transcode-samplerate=0 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay' strcat mrl value playlist_add" />
+ <vlc id="end" />
+
+<!-- audio/video joue et transcode avec sortie sur PC - Type 3 -->
+ <vlc id="if" param1="type value 3 =" />
+ <vlc id="rpn" param1="vlc_stop" />
+ <vlc id="rpn" param1="playlist_empty" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout=#duplicate{dst=transcode:std,select=video,dst=display,select=audio} :sout-transcode-vcodec=mp2v :sout-transcode-vb=4096 :sout-transcode-acodec=a52 :sout-transcode-ab=512 :sout-transcode-channels=6 :sout-transcode-samplerate=0 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay' strcat mrl value playlist_add vlc_play" />
+ <vlc id="end" />
+
+<!-- audio/video ajoute et transcode avec sortie sur PC - Type 4 -->
+ <vlc id="if" param1="type value 4 =" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout=#duplicate{dst=transcode:std,select=video,dst=display,select=audio} :sout-transcode-vcodec=mp2v :sout-transcode-vb=4096 :sout-transcode-acodec=a52 :sout-transcode-ab=512 :sout-transcode-channels=6 :sout-transcode-samplerate=0 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay' strcat mrl value playlist_add" />
+ <vlc id="end" />
+
+<!-- audio/video joue et transcode avec sortie en AC3 - Type 5 -->
+ <vlc id="if" param1="type value 5 =" />
+ <vlc id="rpn" param1="vlc_stop" />
+ <vlc id="rpn" param1="playlist_empty" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=4096 :sout-transcode-ab=512 :sout-transcode-channels=6 :sout-transcode-acodec=a52 :sout-transcode-samplerate=0 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay' strcat mrl value playlist_add vlc_play" />
+ <vlc id="end" />
+
+<!-- audio/video ajoute et transcode avec sortie en AC3 - Type 6 -->
+ <vlc id="if" param1="type value 6 =" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=4096 :sout-transcode-ab=512 :sout-transcode-channels=6 :sout-transcode-acodec=a52 :sout-transcode-samplerate=0 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay' strcat mrl value playlist_add" />
+ <vlc id="end" />
+
+<!-- messagerie audio - Type 7 -->
+ <vlc id="if" param1="type value 7 =" />
+ <vlc id="rpn" param1="vlc_stop" />
+ <vlc id="rpn" param1="playlist_empty" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=256 :sout-transcode-acodec=mpga :sout-transcode-channels=2 :sout-transcode-samplerate=48000' strcat mrl value playlist_add vlc_play" />
+ <vlc id="end" />
+
+<!-- Fichiers photos -->
+
+<!-- photo jouee normalement - Type 20 -->
+ <vlc id="if" param1="type value 20 =" />
+ <vlc id="rpn" param1="0 loop 'VLC_OBJECT_PLAYLIST' vlc_var_set"/>
+ <vlc id="rpn" param1="0 random 'VLC_OBJECT_PLAYLIST' vlc_var_set"/>
+ <vlc id="rpn" param1="0 repeat 'VLC_OBJECT_PLAYLIST' vlc_var_set"/>
+ <vlc id="rpn" param1="vlc_stop" />
+ <vlc id="rpn" param1="playlist_empty" />
+ <vlc id="rpn" param1="'temps' url_extract 'fake-duration' vlc_config_set" />
+ <vlc id="rpn" param1="'fake: :sout=#transcode:std :sout-transcode-vb=2048 :sout-transcode-vt=1000000 :sout-transcode-vcodec=mp2v :fake-width=720 :fake-height=576 :fake-aspect-ratio=4:3 :fake-duration=4000 :sout-udp-caching=100 :fake-file=' mrl value strcat mrl value playlist_add vlc_play" />
+ <vlc id="end" />
+
+
+<!-- photo ajoutee normalement - Type 21 -->
+ <vlc id="if" param1="type value 21 =" />
+ <vlc id="rpn" param1="0 loop 'VLC_OBJECT_PLAYLIST' vlc_var_set"/>
+ <vlc id="rpn" param1="0 random 'VLC_OBJECT_PLAYLIST' vlc_var_set"/>
+ <vlc id="rpn" param1="0 repeat 'VLC_OBJECT_PLAYLIST' vlc_var_set"/>
+ <vlc id="rpn" param1="'temps' url_extract 'fake-duration' vlc_config_set" />
+ <vlc id="rpn" param1="'fake: :sout=#transcode:std :sout-transcode-vb=2048 :sout-transcode-vt=1000000 :sout-transcode-vcodec=mp2v :fake-width=720 :fake-height=576 :fake-aspect-ratio=4:3 :fake-duration=4000 :sout-udp-caching=100 :fake-file=' mrl value strcat mrl value playlist_add" />
+ <vlc id="end" />
+
+
+<!-- playlist de photo jouee normalement - Type 22 -->
+ <vlc id="if" param1="type value 22 =" />
+ <vlc id="rpn" param1="vlc_stop" />
+ <vlc id="rpn" param1="playlist_empty" />
+ <vlc id="rpn" param1="0 loop 'VLC_OBJECT_PLAYLIST' vlc_var_set"/>
+ <vlc id="rpn" param1="0 random 'VLC_OBJECT_PLAYLIST' vlc_var_set"/>
+ <vlc id="rpn" param1="0 repeat 'VLC_OBJECT_PLAYLIST' vlc_var_set"/>
+ <vlc id="rpn" param1="'temps' url_extract 'fake-duration' vlc_config_set" />
+ <vlc id="rpn" param1="qfile value mrl value playlist_add vlc_play" />
+ <vlc id="end" />
+
+<!-- playlist de photo ajoutee normalement - Type 23 -->
+ <vlc id="if" param1="type value 23 =" />
+ <vlc id="rpn" param1="0 loop 'VLC_OBJECT_PLAYLIST' vlc_var_set"/>
+ <vlc id="rpn" param1="0 random 'VLC_OBJECT_PLAYLIST' vlc_var_set"/>
+ <vlc id="rpn" param1="0 repeat 'VLC_OBJECT_PLAYLIST' vlc_var_set"/>
+ <vlc id="rpn" param1="'temps' url_extract 'fake-duration' vlc_config_set" />
+ <vlc id="rpn" param1="qfile value mrl value playlist_add" />
+ <vlc id="end" />
+
+
+<!-- DVDs -->
+
+<!-- dvd joue normalement - transcodage audio - Type 30 -->
+ <vlc id="if" param1="type value 30 =" />
+ <vlc id="rpn" param1="vlc_stop" />
+ <vlc id="rpn" param1="playlist_empty" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=256 :sout-transcode-acodec=mpga :sout-transcode-channels=2 :dvd-caching=500 :sout-udp-caching=300 :audio-language=fr :sout-transcode-vb=9600 :sout-transcode-vcodec=mp2v :sout=#transcode{scale=1,soverlay}:duplicate{dst=std{mux=ts}}' strcat mrl value playlist_add vlc_play" />
+ <vlc id="end" />
+
+<!-- dvd joue normalement - sortie audio PC - Type 31 -->
+ <vlc id="if" param1="type value 31 =" />
+ <vlc id="rpn" param1="vlc_stop" />
+ <vlc id="rpn" param1="playlist_empty" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=256 :sout-transcode-acodec=mpga :sout-transcode-channels=2 :dvd-caching=500 :sout-udp-caching=300 :audio-language=fr :sout-transcode-vb=9600 :sout-transcode-vcodec=mp2v :sout=#transcode{scale=1,soverlay}:duplicate{dst=std{mux=ts},select=video,dst=display,select=audio}' strcat mrl value playlist_add vlc_play" />
+ <vlc id="end" />
+
+<!-- dvd joue normalement - Sortie AC3 audio - Type 32 -->
+ <vlc id="if" param1="type value 32 =" />
+ <vlc id="rpn" param1="vlc_stop" />
+ <vlc id="rpn" param1="playlist_empty" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=512 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :dvd-caching=500 :sout-udp-caching=300 :audio-language=fr :sout-transcode-vb=9600 :sout-transcode-vcodec=mp2v :sout=#transcode{scale=1,soverlay}:duplicate{dst=std{mux=ts}}' strcat mrl value playlist_add vlc_play" />
+ <vlc id="end" />
+
+<!-- dvd ajoute normalement - transcodage audio - Type 33 -->
+ <vlc id="if" param1="type value 33 =" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=256 :sout-transcode-acodec=mpga :sout-transcode-channels=2 :sout-transcode-samplerate=0 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add" />
+ <vlc id="end" />
+
+<!-- dvd ajoute normalement - sortie audio PC - Type 34 -->
+ <vlc id="if" param1="type value 34 =" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout=#duplicate{dst...
[truncated message content] |
|
From: <gu...@us...> - 2007-05-01 15:27:02
|
Revision: 139
http://svn.sourceforge.net/easybox-mod/?rev=139&view=rev
Author: guyou
Date: 2007-05-01 08:26:59 -0700 (Tue, 01 May 2007)
Log Message:
-----------
Ajout svn:eol-style=native sur fichiers .php (#1699723)
Modified Paths:
--------------
trunk/_framework/aide/help.php
trunk/_framework/bouton/bouton_general.php
trunk/_framework/cartouche.php
trunk/_framework/cr_xml.php
trunk/_framework/dwl.php
trunk/_framework/favoris_touches.php
trunk/_framework/img2fbx.php
trunk/_framework/init_version.php
trunk/_framework/lib/date.php
trunk/_framework/lib/get_info.php
trunk/_framework/lib/img_cr.php
trunk/_framework/lib/ini.php
trunk/_framework/lib/plugins/function.attribbouton.php
trunk/_framework/lib/plugins/function.attribmeta.php
trunk/_framework/lib/plugins/function.setbackground.php
trunk/_framework/lib/zip.php
trunk/_framework/login.php
trunk/configuration/addimage.php
trunk/configuration/ajout_evenement.php
trunk/configuration/class/class.id3.php
trunk/configuration/class/class.ogg.php
trunk/configuration/config_agenda.php
trunk/configuration/configajout.php
trunk/configuration/configmodif.php
trunk/configuration/configuration.php
trunk/configuration/demarrage.php
trunk/configuration/edit.php
trunk/configuration/editrss.php
trunk/configuration/fonctions_agenda.php
trunk/configuration/general.php
trunk/configuration/index1.php
trunk/configuration/modules.php
trunk/configuration/nav.php
trunk/configuration/podcast.php
trunk/configuration/rss.php
trunk/configuration/save_config.php
trunk/configuration/scan.php
trunk/configuration/scan_amc.php
trunk/configuration/scan_audio.php
trunk/configuration/scan_video.php
trunk/configuration/screensaver.php
trunk/configuration/skin.php
trunk/configuration/sup_evenement.php
trunk/configuration/temp.php
trunk/configuration/verif_config.php
trunk/copyright.php
trunk/erreur.php
trunk/lecteur/lunch_rec.php
trunk/lecteur/stop_rec.php
trunk/module/_explorateur/index1.php
trunk/module/agenda/config.php
trunk/module/agenda/description.php
trunk/module/agenda/enregistrements.php
trunk/module/agenda/evenements.php
trunk/module/agenda/fonctions/create_db.php
trunk/module/agenda/fonctions/db.php
trunk/module/agenda/fonctions/fonctions.php
trunk/module/agenda/index1.php
trunk/module/agenda/outlook.php
trunk/module/allocine/index1.php
trunk/module/allocine/jf_extralib.php
trunk/module/allocine/playba_allocine.php
trunk/module/cac40/index1.php
trunk/module/cinefil/index1.php
trunk/module/clips/play_clip.php
trunk/module/dailymotion/play_dailymotion.php
trunk/module/dvd/playrep.php
trunk/module/ephemeride/anivdujour.php
trunk/module/ephemeride/index1.php
trunk/module/eteindre/index1.php
trunk/module/films/catalogue.php
trunk/module/films/fichefilm.php
trunk/module/films/play.php
trunk/module/films/playba.php
trunk/module/films/playrep.php
trunk/module/freeboxtv/content.php
trunk/module/freeboxtv/epg.php
trunk/module/freeboxtv/freeboxtv.php
trunk/module/guidetv/tvprogram.php
trunk/module/horloge/index1.php
trunk/module/infotrafic/create_image.php
trunk/module/infotrafic/index1.php
trunk/module/infotrafic/legende.php
trunk/module/jt/chaine.php
trunk/module/jt/index1.php
trunk/module/livescore/classement.php
trunk/module/livescore/index1.php
trunk/module/livescore/journee.php
trunk/module/loto/euromillions.php
trunk/module/loto/images/num.php
trunk/module/loto/images/numero.php
trunk/module/loto/index1.php
trunk/module/loto/loto.php
trunk/module/mail/index1.php
trunk/module/meteo/imgmeteoft.php
trunk/module/meteo/index1.php
trunk/module/modules/index1.php
trunk/module/mp3/catalogue.php
trunk/module/mp3/class.id3.php
trunk/module/mp3/class.ogg.php
trunk/module/mp3/index1.php
trunk/module/mp3/jaquette.php
trunk/module/mp3/lecteuraudio.php
trunk/module/mp3/paroles.php
trunk/module/mp3/webradios.php
trunk/module/multiposte/add.php
trunk/module/multiposte/index1.php
trunk/module/othello/index1.php
trunk/module/pendu/img_pendu.php
trunk/module/pendu/index1.php
trunk/module/recettes/index1.php
trunk/module/recettes/recettes.php
trunk/module/reseaufree/idf.php
trunk/module/reseaufree/index1.php
trunk/module/reseaufree/phpinfo.php
trunk/module/reseaufree/province.php
trunk/module/reseaufree/provincene.php
trunk/module/reseaufree/provincese.php
trunk/module/reseaufree/provinceso.php
trunk/module/rss/index1.php
trunk/module/screensaver/index1.php
trunk/module/seances/index1.php
trunk/module/seances/listesalle.php
trunk/module/seances/listeville.php
trunk/module/seances/voirsalle.php
trunk/module/signet/index1.php
trunk/module/signet/signetsav.php
trunk/module/signet/supall.php
trunk/module/signet/supsignet.php
trunk/module/sudoku/index1.php
trunk/module/webmedia/index1.php
trunk/module/youtube/play_youtube.php
trunk/remplir bdd.php
trunk/skin/mediacenter/aide.php
trunk/skin/mediacenter/config_skin.php
trunk/skin/mediacenter/framework_skin.php
trunk/skin/simple/aide.php
trunk/skin/simple/config_skin.php
trunk/skin/simple/framework_skin.php
trunk/skin/simplegreen/aide.php
trunk/skin/simplegreen/config_skin.php
trunk/skin/simplegreen/framework_skin.php
trunk/testeur.php
Property Changed:
----------------
trunk/_framework/aide/help.php
trunk/_framework/aide/tutorial.php
trunk/_framework/bouton/bouton_general.php
trunk/_framework/cartouche.php
trunk/_framework/cr_xml.php
trunk/_framework/demarrage.php
trunk/_framework/dwl.php
trunk/_framework/favoris_touches.php
trunk/_framework/fonctions_partagees.inc.php
trunk/_framework/framework.php
trunk/_framework/img2fbx.php
trunk/_framework/init_version.php
trunk/_framework/lib/Config_File.class.php
trunk/_framework/lib/Smarty.class.php
trunk/_framework/lib/Smarty_Compiler.class.php
trunk/_framework/lib/date.php
trunk/_framework/lib/get_info.php
trunk/_framework/lib/img_cr.php
trunk/_framework/lib/ini.php
trunk/_framework/lib/internals/core.assemble_plugin_filepath.php
trunk/_framework/lib/internals/core.assign_smarty_interface.php
trunk/_framework/lib/internals/core.create_dir_structure.php
trunk/_framework/lib/internals/core.display_debug_console.php
trunk/_framework/lib/internals/core.get_include_path.php
trunk/_framework/lib/internals/core.get_microtime.php
trunk/_framework/lib/internals/core.get_php_resource.php
trunk/_framework/lib/internals/core.is_secure.php
trunk/_framework/lib/internals/core.is_trusted.php
trunk/_framework/lib/internals/core.load_plugins.php
trunk/_framework/lib/internals/core.load_resource_plugin.php
trunk/_framework/lib/internals/core.process_cached_inserts.php
trunk/_framework/lib/internals/core.process_compiled_include.php
trunk/_framework/lib/internals/core.read_cache_file.php
trunk/_framework/lib/internals/core.rm_auto.php
trunk/_framework/lib/internals/core.rmdir.php
trunk/_framework/lib/internals/core.run_insert_handler.php
trunk/_framework/lib/internals/core.smarty_include_php.php
trunk/_framework/lib/internals/core.write_cache_file.php
trunk/_framework/lib/internals/core.write_compiled_include.php
trunk/_framework/lib/internals/core.write_compiled_resource.php
trunk/_framework/lib/internals/core.write_file.php
trunk/_framework/lib/plugins/block.textformat.php
trunk/_framework/lib/plugins/compiler.assign.php
trunk/_framework/lib/plugins/function.assign_debug_info.php
trunk/_framework/lib/plugins/function.attribbouton.php
trunk/_framework/lib/plugins/function.attribmeta.php
trunk/_framework/lib/plugins/function.config_load.php
trunk/_framework/lib/plugins/function.counter.php
trunk/_framework/lib/plugins/function.cycle.php
trunk/_framework/lib/plugins/function.debug.php
trunk/_framework/lib/plugins/function.eval.php
trunk/_framework/lib/plugins/function.fetch.php
trunk/_framework/lib/plugins/function.html_checkboxes.php
trunk/_framework/lib/plugins/function.html_image.php
trunk/_framework/lib/plugins/function.html_options.php
trunk/_framework/lib/plugins/function.html_radios.php
trunk/_framework/lib/plugins/function.html_select_date.php
trunk/_framework/lib/plugins/function.html_select_time.php
trunk/_framework/lib/plugins/function.html_table.php
trunk/_framework/lib/plugins/function.mailto.php
trunk/_framework/lib/plugins/function.math.php
trunk/_framework/lib/plugins/function.popup.php
trunk/_framework/lib/plugins/function.popup_init.php
trunk/_framework/lib/plugins/function.setbackground.php
trunk/_framework/lib/plugins/modifier.capitalize.php
trunk/_framework/lib/plugins/modifier.cat.php
trunk/_framework/lib/plugins/modifier.count_characters.php
trunk/_framework/lib/plugins/modifier.count_paragraphs.php
trunk/_framework/lib/plugins/modifier.count_sentences.php
trunk/_framework/lib/plugins/modifier.count_words.php
trunk/_framework/lib/plugins/modifier.date_format.php
trunk/_framework/lib/plugins/modifier.debug_print_var.php
trunk/_framework/lib/plugins/modifier.default.php
trunk/_framework/lib/plugins/modifier.escape.php
trunk/_framework/lib/plugins/modifier.indent.php
trunk/_framework/lib/plugins/modifier.lower.php
trunk/_framework/lib/plugins/modifier.nl2br.php
trunk/_framework/lib/plugins/modifier.regex_replace.php
trunk/_framework/lib/plugins/modifier.replace.php
trunk/_framework/lib/plugins/modifier.spacify.php
trunk/_framework/lib/plugins/modifier.string_format.php
trunk/_framework/lib/plugins/modifier.strip.php
trunk/_framework/lib/plugins/modifier.strip_tags.php
trunk/_framework/lib/plugins/modifier.truncate.php
trunk/_framework/lib/plugins/modifier.upper.php
trunk/_framework/lib/plugins/modifier.wordwrap.php
trunk/_framework/lib/plugins/outputfilter.trimwhitespace.php
trunk/_framework/lib/plugins/shared.escape_special_chars.php
trunk/_framework/lib/plugins/shared.make_timestamp.php
trunk/_framework/lib/zip.php
trunk/_framework/login.php
trunk/_utilisateur/test.php
trunk/configuration/addimage.php
trunk/configuration/ajout_evenement.php
trunk/configuration/class/class.id3.php
trunk/configuration/class/class.ogg.php
trunk/configuration/config_agenda.php
trunk/configuration/configajout.php
trunk/configuration/configliste.php
trunk/configuration/configmodif.php
trunk/configuration/configuration.php
trunk/configuration/demarrage.php
trunk/configuration/edit.php
trunk/configuration/editrss.php
trunk/configuration/fonctions_agenda.php
trunk/configuration/general.php
trunk/configuration/index1.php
trunk/configuration/modules.php
trunk/configuration/nav.php
trunk/configuration/podcast.php
trunk/configuration/rss.php
trunk/configuration/save_config.php
trunk/configuration/scan.php
trunk/configuration/scan_amc.php
trunk/configuration/scan_audio.php
trunk/configuration/scan_video.php
trunk/configuration/screensaver.php
trunk/configuration/skin.php
trunk/configuration/sup_evenement.php
trunk/configuration/temp.php
trunk/configuration/verif_config.php
trunk/copyright.php
trunk/erreur.php
trunk/lecteur/lunch_rec.php
trunk/lecteur/stop_rec.php
trunk/module/_explorateur/index1.php
trunk/module/_menu/menu.php
trunk/module/agenda/config.php
trunk/module/agenda/description.php
trunk/module/agenda/enregistrements.php
trunk/module/agenda/evenements.php
trunk/module/agenda/fonctions/create_db.php
trunk/module/agenda/fonctions/db.php
trunk/module/agenda/fonctions/fonctions.php
trunk/module/agenda/index1.php
trunk/module/agenda/outlook.php
trunk/module/allocine/index1.php
trunk/module/allocine/jf_extralib.php
trunk/module/allocine/playba_allocine.php
trunk/module/cac40/index1.php
trunk/module/cinefil/index1.php
trunk/module/clips/index1.php
trunk/module/clips/play_clip.php
trunk/module/dailymotion/index1.php
trunk/module/dailymotion/play_dailymotion.php
trunk/module/diaporama/index1.php
trunk/module/dvd/index1.php
trunk/module/dvd/playrep.php
trunk/module/ephemeride/anivdujour.php
trunk/module/ephemeride/index1.php
trunk/module/eteindre/index1.php
trunk/module/favoris/index1.php
trunk/module/films/catalogue.php
trunk/module/films/fichefilm.php
trunk/module/films/index1.php
trunk/module/films/info.php
trunk/module/films/lecture.php
trunk/module/films/play.php
trunk/module/films/playba.php
trunk/module/films/playrep.php
trunk/module/freeboxtv/content.php
trunk/module/freeboxtv/epg.php
trunk/module/freeboxtv/freeboxtv.php
trunk/module/guidetv/tvprogram.php
trunk/module/horloge/horloge.php
trunk/module/horloge/index1.php
trunk/module/horoscope/index1.php
trunk/module/infotrafic/create_image.php
trunk/module/infotrafic/index1.php
trunk/module/infotrafic/legende.php
trunk/module/jt/chaine.php
trunk/module/jt/index1.php
trunk/module/livescore/classement.php
trunk/module/livescore/index1.php
trunk/module/livescore/journee.php
trunk/module/loto/euromillions.php
trunk/module/loto/images/num.php
trunk/module/loto/images/numero.php
trunk/module/loto/index1.php
trunk/module/loto/keno.php
trunk/module/loto/loto.php
trunk/module/mail/index1.php
trunk/module/messagerie/index1.php
trunk/module/meteo/imgmeteoft.php
trunk/module/meteo/index1.php
trunk/module/modules/index1.php
trunk/module/morpion/index1.php
trunk/module/mp3/catalogue.php
trunk/module/mp3/class.id3.php
trunk/module/mp3/class.ogg.php
trunk/module/mp3/index1.php
trunk/module/mp3/jaquette.php
trunk/module/mp3/lecteuraudio.php
trunk/module/mp3/paroles.php
trunk/module/mp3/playdb.php
trunk/module/mp3/podcast.php
trunk/module/mp3/webradios.php
trunk/module/multiposte/add.php
trunk/module/multiposte/index1.php
trunk/module/othello/index1.php
trunk/module/pendu/img_pendu.php
trunk/module/pendu/index1.php
trunk/module/recettes/index1.php
trunk/module/recettes/recettes.php
trunk/module/reseaufree/idf.php
trunk/module/reseaufree/index1.php
trunk/module/reseaufree/libchart/classes/Axis.php
trunk/module/reseaufree/libchart/classes/BarChart.php
trunk/module/reseaufree/libchart/classes/Chart.php
trunk/module/reseaufree/libchart/classes/Color.php
trunk/module/reseaufree/libchart/classes/HorizontalChart.php
trunk/module/reseaufree/libchart/classes/LineChart.php
trunk/module/reseaufree/libchart/classes/PieChart.php
trunk/module/reseaufree/libchart/classes/Point.php
trunk/module/reseaufree/libchart/classes/Primitive.php
trunk/module/reseaufree/libchart/classes/Text.php
trunk/module/reseaufree/libchart/classes/VerticalChart.php
trunk/module/reseaufree/libchart/libchart.php
trunk/module/reseaufree/phpinfo.php
trunk/module/reseaufree/province.php
trunk/module/reseaufree/provincene.php
trunk/module/reseaufree/provinceno.php
trunk/module/reseaufree/provincese.php
trunk/module/reseaufree/provinceso.php
trunk/module/reseaufree/speedtest.php
trunk/module/rss/index1.php
trunk/module/screensaver/index1.php
trunk/module/seances/index1.php
trunk/module/seances/listesalle.php
trunk/module/seances/listeville.php
trunk/module/seances/voirsalle.php
trunk/module/signet/index1.php
trunk/module/signet/playsignet.php
trunk/module/signet/signetsav.php
trunk/module/signet/supall.php
trunk/module/signet/supsignet.php
trunk/module/sudoku/index1.php
trunk/module/webmedia/index1.php
trunk/module/youtube/index1.php
trunk/module/youtube/play_youtube.php
trunk/remplir bdd.php
trunk/skin/mediacenter/aide.php
trunk/skin/mediacenter/config_skin.php
trunk/skin/mediacenter/framework_skin.php
trunk/skin/simple/aide.php
trunk/skin/simple/config_skin.php
trunk/skin/simple/framework_skin.php
trunk/skin/simplegreen/aide.php
trunk/skin/simplegreen/config_skin.php
trunk/skin/simplegreen/framework_skin.php
trunk/testeur.php
Modified: trunk/_framework/aide/help.php
===================================================================
--- trunk/_framework/aide/help.php 2007-05-01 15:20:56 UTC (rev 138)
+++ trunk/_framework/aide/help.php 2007-05-01 15:26:59 UTC (rev 139)
@@ -1,35 +1,35 @@
-<?php
- $RACINE_REP = "../../";
- require($RACINE_REP.'_framework/framework.php');
-
- if ($vers_fbx==5) $typeTel = 'telehd';
- else $typeTel = 'tele';
-
- if (isset($_GET['affichage'])) $affichage = $_GET['affichage'];
- else $affichage = 'telehd';
-
-
- $MENU_ALT=array(array('lien'=>'tutorial.php', 'nom'=>'Tutoriel', 'selected'=>false),
- array('lien'=>'help.php?affichage='.$typeTel, 'nom'=>'T\xE9l\xE9commande', 'selected'=>$affichage=='telehd'),
- array('lien'=>'help.php?affichage=video', 'nom'=>'Module vid\xE9o', 'selected'=>$affichage=='video'),
- array('lien'=>'help.php?affichage=photo', 'nom'=>'Module photo', 'selected'=>$affichage=='photo'),
- array('lien'=>'help.php?affichage=audio', 'nom'=>'Module audio', 'selected'=>$affichage=='audio')
- );
-
- $LINK['red']= $MODULE.'_menu/menu.php';
-
- if ($affichage=="photo")
- $CON = '<center>L\'usage du module photo est assez simple. Entrez dans le dossier o\xF9 se trouve vos photos gr\xE2ce \xE0 l\'explorateur. Les touches verte et bleue permettent de passer de page en page. La touche rouge permet de revenir en arri\xE8re. La touche jaune permet de revenir au dossier parent. Une fois que vous avez affich\xE9 une image seule, vous pouvez passer \xE0 la pr\xE9c\xE9dente ou \xE0 la suivante gr\xE2ce aux touches verte et bleue. En remplissant la case avec un nombre puis en appuyant sur OK, le diaporama se lance et montre les photos dans l\'ordre et enchain\xE9e, en continue. La touche stop arr\xEAte ce diaporama. La touche play lance le diaporama avec un intervalle de temps par d\xE9faut. Pendant l\'affichage d\'une image seule, la touche rouge permet de revenir \xE0 l\'explorateur dans le dossier en cours.</center>';
- elseif ($affichage=="audio")
- $CON = '<center>Le module audio est divis\xE9 en sous-modules. Les modules biblioth\xE8que et explorateur vous permettent d\'ajouter des fichiers \xE0 la playlist. Le bouton rouge fait revenir \xE0 la playlist. Les touches habituelles servent \xE0 naviguer dans la biblioth\xE8que tout comme dans toutes les autres listes.</center>';
- elseif ($affichage=="video")
- $CON = '<center>Le module vid\xE9o ses divise en trois panneau : quand on ne voit aucune informations (cach\xE9e), seul un OSD s\'affiche pour vous informer quand vous appuyez sur la t\xE9l\xE9commande ou autre. Vous pouvez alors, avec les touches haut et bas, avancer ou reculer d\'une minute dans le flux. En particulier, le menu des options se trouve en haut de cette page, qui permet de visualiser les options sur les sous-titres, les chapitres... Dans le module vid\xE9o, la touche rouge sert \xE0 changer la piste sous-titre pour passer \xE0 la suivante. La touche jaune sert \xE0 visualiser les informations sur le fichier en cours (fiche allocin\xE9). La touche bleue sert \xE0 enregistrer un signet.</center>';
- elseif ($affichage=="telehd" AND $typeTel == 'telehd')
- $CON = '<center><img src="images/easyboxhd.gif"></center>';
- else
- $CON = '<center><img src="images/easybox.gif"></center>';
-
- $smarty->assign('TITRE','Aide');
- $smarty->assign('CONTENT',$CON);
- $smarty->display('interface.tpl');
-?>
+<?php
+ $RACINE_REP = "../../";
+ require($RACINE_REP.'_framework/framework.php');
+
+ if ($vers_fbx==5) $typeTel = 'telehd';
+ else $typeTel = 'tele';
+
+ if (isset($_GET['affichage'])) $affichage = $_GET['affichage'];
+ else $affichage = 'telehd';
+
+
+ $MENU_ALT=array(array('lien'=>'tutorial.php', 'nom'=>'Tutoriel', 'selected'=>false),
+ array('lien'=>'help.php?affichage='.$typeTel, 'nom'=>'T\xE9l\xE9commande', 'selected'=>$affichage=='telehd'),
+ array('lien'=>'help.php?affichage=video', 'nom'=>'Module vid\xE9o', 'selected'=>$affichage=='video'),
+ array('lien'=>'help.php?affichage=photo', 'nom'=>'Module photo', 'selected'=>$affichage=='photo'),
+ array('lien'=>'help.php?affichage=audio', 'nom'=>'Module audio', 'selected'=>$affichage=='audio')
+ );
+
+ $LINK['red']= $MODULE.'_menu/menu.php';
+
+ if ($affichage=="photo")
+ $CON = '<center>L\'usage du module photo est assez simple. Entrez dans le dossier o\xF9 se trouve vos photos gr\xE2ce \xE0 l\'explorateur. Les touches verte et bleue permettent de passer de page en page. La touche rouge permet de revenir en arri\xE8re. La touche jaune permet de revenir au dossier parent. Une fois que vous avez affich\xE9 une image seule, vous pouvez passer \xE0 la pr\xE9c\xE9dente ou \xE0 la suivante gr\xE2ce aux touches verte et bleue. En remplissant la case avec un nombre puis en appuyant sur OK, le diaporama se lance et montre les photos dans l\'ordre et enchain\xE9e, en continue. La touche stop arr\xEAte ce diaporama. La touche play lance le diaporama avec un intervalle de temps par d\xE9faut. Pendant l\'affichage d\'une image seule, la touche rouge permet de revenir \xE0 l\'explorateur dans le dossier en cours.</center>';
+ elseif ($affichage=="audio")
+ $CON = '<center>Le module audio est divis\xE9 en sous-modules. Les modules biblioth\xE8que et explorateur vous permettent d\'ajouter des fichiers \xE0 la playlist. Le bouton rouge fait revenir \xE0 la playlist. Les touches habituelles servent \xE0 naviguer dans la biblioth\xE8que tout comme dans toutes les autres listes.</center>';
+ elseif ($affichage=="video")
+ $CON = '<center>Le module vid\xE9o ses divise en trois panneau : quand on ne voit aucune informations (cach\xE9e), seul un OSD s\'affiche pour vous informer quand vous appuyez sur la t\xE9l\xE9commande ou autre. Vous pouvez alors, avec les touches haut et bas, avancer ou reculer d\'une minute dans le flux. En particulier, le menu des options se trouve en haut de cette page, qui permet de visualiser les options sur les sous-titres, les chapitres... Dans le module vid\xE9o, la touche rouge sert \xE0 changer la piste sous-titre pour passer \xE0 la suivante. La touche jaune sert \xE0 visualiser les informations sur le fichier en cours (fiche allocin\xE9). La touche bleue sert \xE0 enregistrer un signet.</center>';
+ elseif ($affichage=="telehd" AND $typeTel == 'telehd')
+ $CON = '<center><img src="images/easyboxhd.gif"></center>';
+ else
+ $CON = '<center><img src="images/easybox.gif"></center>';
+
+ $smarty->assign('TITRE','Aide');
+ $smarty->assign('CONTENT',$CON);
+ $smarty->display('interface.tpl');
+?>
Property changes on: trunk/_framework/aide/help.php
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/_framework/aide/tutorial.php
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/_framework/bouton/bouton_general.php
===================================================================
--- trunk/_framework/bouton/bouton_general.php 2007-05-01 15:20:56 UTC (rev 138)
+++ trunk/_framework/bouton/bouton_general.php 2007-05-01 15:26:59 UTC (rev 139)
@@ -1,41 +1,41 @@
-<?php
-
- $pageact = substr($_SERVER["REQUEST_URI"],0,strpos($_SERVER["REQUEST_URI"].'?', "?"));
-
- //-- Active les favoris touches
- $n='0'; $trouve ='0';
- while ($n <= '9'){ if ($ini['favoris']['touche'.$n]!=".") { $trouve = '1'; } $n++; }
- //-- On active les touches si trouve = 1
- if ($trouve == '1' AND $TOUCHE_FAVORIS!="NON") {
- $META['nochannel_page']=$FRAMEWORK_REP.'favoris_touches.php?favoris_touche=%d';
- }
-
- $LINK['help']=$FRAMEWORK_REP.'aide/help.php?page='.urlencode($_SERVER["SCRIPT_NAME"]);
-
- if($VLC['etat']=='playing' && !eregi('background.jpg',$VLC['url_current'])){
- $LINK['stop']=$MODULE.'films/lecture.php?control=stop';
- $LINK['play']=$MODULE.'films/lecture.php?control=pause';
- $LINK['pause']=$MODULE.'films/lecture.php?control=pause';
- $LINK['info']=$MODULE.'films/info.php';
-
- if($VLC['type_current']=='video' OR $VLC['type_current']=='dvd' OR $VLC['type_current']=='stream' OR $VLC['type_current']==''){
- $LINK['info']=$MODULE.'films/info.php';
- }elseif($VLC['type_current']=='audio' || $VLC['type_current']=='cd'){
- $LINK['info']=$MODULE.'mp3/lecteuraudio.php';
- }
-
- }else{
- $LINK['stop']='none';
- $LINK['play']='none';
- $LINK['pause']='none';
- $LINK['info']='none';
- }
-
- $LINK['guide']=$MODULE.'_menu/menu.php';
- $META['home_page']=$MODULE.'_menu/menu.php';
- $META['love_page']=$MODULE.'favoris/index1.php';
- $META['mail_page']=$MODULE.'mail/index1.php';
-
- $smarty->assign_by_ref('META',$META);
- $smarty->assign_by_ref('LINK',$LINK);
-?>
+<?php
+
+ $pageact = substr($_SERVER["REQUEST_URI"],0,strpos($_SERVER["REQUEST_URI"].'?', "?"));
+
+ //-- Active les favoris touches
+ $n='0'; $trouve ='0';
+ while ($n <= '9'){ if ($ini['favoris']['touche'.$n]!=".") { $trouve = '1'; } $n++; }
+ //-- On active les touches si trouve = 1
+ if ($trouve == '1' AND $TOUCHE_FAVORIS!="NON") {
+ $META['nochannel_page']=$FRAMEWORK_REP.'favoris_touches.php?favoris_touche=%d';
+ }
+
+ $LINK['help']=$FRAMEWORK_REP.'aide/help.php?page='.urlencode($_SERVER["SCRIPT_NAME"]);
+
+ if($VLC['etat']=='playing' && !eregi('background.jpg',$VLC['url_current'])){
+ $LINK['stop']=$MODULE.'films/lecture.php?control=stop';
+ $LINK['play']=$MODULE.'films/lecture.php?control=pause';
+ $LINK['pause']=$MODULE.'films/lecture.php?control=pause';
+ $LINK['info']=$MODULE.'films/info.php';
+
+ if($VLC['type_current']=='video' OR $VLC['type_current']=='dvd' OR $VLC['type_current']=='stream' OR $VLC['type_current']==''){
+ $LINK['info']=$MODULE.'films/info.php';
+ }elseif($VLC['type_current']=='audio' || $VLC['type_current']=='cd'){
+ $LINK['info']=$MODULE.'mp3/lecteuraudio.php';
+ }
+
+ }else{
+ $LINK['stop']='none';
+ $LINK['play']='none';
+ $LINK['pause']='none';
+ $LINK['info']='none';
+ }
+
+ $LINK['guide']=$MODULE.'_menu/menu.php';
+ $META['home_page']=$MODULE.'_menu/menu.php';
+ $META['love_page']=$MODULE.'favoris/index1.php';
+ $META['mail_page']=$MODULE.'mail/index1.php';
+
+ $smarty->assign_by_ref('META',$META);
+ $smarty->assign_by_ref('LINK',$LINK);
+?>
Property changes on: trunk/_framework/bouton/bouton_general.php
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/_framework/cartouche.php
===================================================================
--- trunk/_framework/cartouche.php 2007-05-01 15:20:56 UTC (rev 138)
+++ trunk/_framework/cartouche.php 2007-05-01 15:26:59 UTC (rev 139)
@@ -1,86 +1,86 @@
-<?php
-
-$cacher = array('Guide','Interface','Lien info','Lien film');
-
- foreach($xml_aide->channel->all->fonction as $fonc) {
- switch($fonc->title) {
- case 'Stop':
- $titre = '<font family="Symbol">Z</font>';
- break;
- case 'Play':
- $titre = '<font family="Symbol">A</font>';
- break;
- case 'Pause':
- $titre = '<font family="Symbol">Y</font>';
- break;
- case 'Fleches':
- $titre = '<font family="Symbol">L</font>';
- break;
- case 'Bouton bleu':
- $titre = '<img src="'.$AIDE_REP.'images/btn_bleu.gif">';
- break;
- case 'Bouton jaune':
- $titre = '<img src="'.$AIDE_REP.'images/btn_jaune.gif">';
- break;
- case 'Bouton vert':
- $titre = '<img src="'.$AIDE_REP.'images/btn_vert.gif">';
- break;
- case 'Bouton rouge':
- $titre = '<img src="'.$AIDE_REP.'images/btn_rouge.gif">';
- break;
- case 'avance':
- $titre = '<font family="Symbol">AA</font>';
- break;
- case 'recule':
- $titre = '<font family="Symbol">@@</font>';
- break;
- case 'Bouton 5':
- $titre = '<font family="Symbol">[</font>';
- break;
- case 'Bouton 6':
- $titre = '<font family="Symbol">%</font>';
- break;
- case 'Bouton trefle':
- $titre = '<font family="Symbol">\xA7</font>';
- break;
- case 'Fleches':
- $titre = '<font family="Symbol">L</font>';
- break;
- case 'Aide (?)':
- $titre = '<img src="'.$AIDE_REP.'images/help.gif">';
- break;
- case 'OK':
- $titre = '<img src="'.$AIDE_REP.'images/ok.gif">';
- break;
- case 'Coeur':
- $titre = '<img src="'.$AIDE_REP.'images/coeur.gif">';
- break;
- case 'Enveloppe':
- $titre = '<img src="'.$AIDE_REP.'images/mail.gif">';
- break;
- case 'Home':
- $titre = '<img src="'.$AIDE_REP.'images/home.gif">';
- break;
- default:
- $titre = $fonc->title;
- }
- if(!in_array($titre,$cacher)){
- $show[]=array($titre,$fonc->description);
- }
- }
-
-
-$number= rand(0,(count($show)-1));
-
-$logo = utf8_decode($show[$number][0]);
-
-$text = utf8_decode($show[$number][1]);
-if(strlen($text)>=50){
- $text=substr($text,0,50)."...";
-}
-
-$smarty->assign('logo',$logo);
-$smarty->assign('text',$text);
-
-?>
-
+<?php
+
+$cacher = array('Guide','Interface','Lien info','Lien film');
+
+ foreach($xml_aide->channel->all->fonction as $fonc) {
+ switch($fonc->title) {
+ case 'Stop':
+ $titre = '<font family="Symbol">Z</font>';
+ break;
+ case 'Play':
+ $titre = '<font family="Symbol">A</font>';
+ break;
+ case 'Pause':
+ $titre = '<font family="Symbol">Y</font>';
+ break;
+ case 'Fleches':
+ $titre = '<font family="Symbol">L</font>';
+ break;
+ case 'Bouton bleu':
+ $titre = '<img src="'.$AIDE_REP.'images/btn_bleu.gif">';
+ break;
+ case 'Bouton jaune':
+ $titre = '<img src="'.$AIDE_REP.'images/btn_jaune.gif">';
+ break;
+ case 'Bouton vert':
+ $titre = '<img src="'.$AIDE_REP.'images/btn_vert.gif">';
+ break;
+ case 'Bouton rouge':
+ $titre = '<img src="'.$AIDE_REP.'images/btn_rouge.gif">';
+ break;
+ case 'avance':
+ $titre = '<font family="Symbol">AA</font>';
+ break;
+ case 'recule':
+ $titre = '<font family="Symbol">@@</font>';
+ break;
+ case 'Bouton 5':
+ $titre = '<font family="Symbol">[</font>';
+ break;
+ case 'Bouton 6':
+ $titre = '<font family="Symbol">%</font>';
+ break;
+ case 'Bouton trefle':
+ $titre = '<font family="Symbol">\xA7</font>';
+ break;
+ case 'Fleches':
+ $titre = '<font family="Symbol">L</font>';
+ break;
+ case 'Aide (?)':
+ $titre = '<img src="'.$AIDE_REP.'images/help.gif">';
+ break;
+ case 'OK':
+ $titre = '<img src="'.$AIDE_REP.'images/ok.gif">';
+ break;
+ case 'Coeur':
+ $titre = '<img src="'.$AIDE_REP.'images/coeur.gif">';
+ break;
+ case 'Enveloppe':
+ $titre = '<img src="'.$AIDE_REP.'images/mail.gif">';
+ break;
+ case 'Home':
+ $titre = '<img src="'.$AIDE_REP.'images/home.gif">';
+ break;
+ default:
+ $titre = $fonc->title;
+ }
+ if(!in_array($titre,$cacher)){
+ $show[]=array($titre,$fonc->description);
+ }
+ }
+
+
+$number= rand(0,(count($show)-1));
+
+$logo = utf8_decode($show[$number][0]);
+
+$text = utf8_decode($show[$number][1]);
+if(strlen($text)>=50){
+ $text=substr($text,0,50)."...";
+}
+
+$smarty->assign('logo',$logo);
+$smarty->assign('text',$text);
+
+?>
+
Property changes on: trunk/_framework/cartouche.php
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/_framework/cr_xml.php
===================================================================
--- trunk/_framework/cr_xml.php 2007-05-01 15:20:56 UTC (rev 138)
+++ trunk/_framework/cr_xml.php 2007-05-01 15:26:59 UTC (rev 139)
@@ -1,125 +1,125 @@
-<?php
- //// Constructeur XML
- $rec_xml = '<?xml version="1.0" encoding="iso-8859-1"?>
-<rss xmlns:dc="http://purl.org/dc/elements/1.1/" version="2.0">
-<channel>
-';
- $rec_xml.= ' <categorie name="Multim\xE9dia" repertoire="cinefil.gif">
-';
- $y = 0;
- $u = 0;
- while ($u <= $l_module[$y]) {
- $rec_xml.=' <module>
- <name>'.$l_module_name[$y][$u].'</name>
- <repertoire>'.$l_module_repertoire[$y][$u].'</repertoire>
- <lien>'.$l_module_lien[$y][$u].'</lien>
- <actif1>'.$l_module_a1[$y][$u].'</actif1>
- <actif2>'.$l_module_a2[$y][$u].'</actif2>
- <actif3>'.$l_module_a3[$y][$u].'</actif3>
- <actif4>'.$l_module_a4[$y][$u].'</actif4>
- <actif5>'.$l_module_a5[$y][$u].'</actif5>
- <version>'.$l_module_version[$y][$u].'</version>
- </module>
-';
- $u++;
- }
- $rec_xml.= ' </categorie>
- <categorie name="Cin\xE9ma" repertoire="cinefil.gif">
-';
- $y++;
- $u = 0;
- while ($u <= $l_module[$y]) {
- $rec_xml.=' <module>
- <name>'.$l_module_name[$y][$u].'</name>
- <repertoire>'.$l_module_repertoire[$y][$u].'</repertoire>
- <lien>'.$l_module_lien[$y][$u].'</lien>
- <actif1>'.$l_module_a1[$y][$u].'</actif1>
- <actif2>'.$l_module_a2[$y][$u].'</actif2>
- <actif3>'.$l_module_a3[$y][$u].'</actif3>
- <actif4>'.$l_module_a4[$y][$u].'</actif4>
- <actif5>'.$l_module_a5[$y][$u].'</actif5>
- <version>'.$l_module_version[$y][$u].'</version>
- </module>
-';
- $u++;
- }
- $rec_xml.= ' </categorie>
- <categorie name="Internet" repertoire="firefox.gif">
-';
- $y++;
- $u = 0;
- while ($u <= $l_module[$y]) {
- $rec_xml.=' <module>
- <name>'.$l_module_name[$y][$u].'</name>
- <repertoire>'.$l_module_repertoire[$y][$u].'</repertoire>
- <lien>'.$l_module_lien[$y][$u].'</lien>
- <actif1>'.$l_module_a1[$y][$u].'</actif1>
- <actif2>'.$l_module_a2[$y][$u].'</actif2>
- <actif3>'.$l_module_a3[$y][$u].'</actif3>
- <actif4>'.$l_module_a4[$y][$u].'</actif4>
- <actif5>'.$l_module_a5[$y][$u].'</actif5>
- <version>'.$l_module_version[$y][$u].'</version>
- </module>
-'; $u++;
- }
- $rec_xml.= ' </categorie>
- <categorie name="Infos" repertoire="menunews.gif">
-';
- $y++;
- $u = 0;
- while ($u <= $l_module[$y]) {
- $rec_xml.=' <module>
- <name>'.$l_module_name[$y][$u].'</name>
- <repertoire>'.$l_module_repertoire[$y][$u].'</repertoire>
- <lien>'.$l_module_lien[$y][$u].'</lien>
- <actif1>'.$l_module_a1[$y][$u].'</actif1>
- <actif2>'.$l_module_a2[$y][$u].'</actif2>
- <actif3>'.$l_module_a3[$y][$u].'</actif3>
- <actif4>'.$l_module_a4[$y][$u].'</actif4>
- <actif5>'.$l_module_a5[$y][$u].'</actif5>
- <version>'.$l_module_version[$y][$u].'</version>
- </module>
-';
- $u++;
- }
- $rec_xml.= ' </categorie>
- <categorie name="Pratique" repertoire="horloge.gif">
-';
- $y++;
- $u = 0;
- while ($u <= $l_module[$y]) {
- $rec_xml.=' <module>
- <name>'.$l_module_name[$y][$u].'</name>
- <repertoire>'.$l_module_repertoire[$y][$u].'</repertoire>
- <lien>'.$l_module_lien[$y][$u].'</lien>
- <actif1>'.$l_module_a1[$y][$u].'</actif1>
- <actif2>'.$l_module_a2[$y][$u].'</actif2>
- <actif3>'.$l_module_a3[$y][$u].'</actif3>
- <actif4>'.$l_module_a4[$y][$u].'</actif4>
- <actif5>'.$l_module_a5[$y][$u].'</actif5>
- <version>'.$l_module_version[$y][$u].'</version>
- </module>
-';
- $u++;
- }
- $rec_xml.= ' </categorie>
- <categorie name="Suplement">';
- $y++;
- $u = 0;
- while ($u <= $l_module[$y]) {
- $rec_xml.=' <module>
- <name>'.$l_module_name[$y][$u].'</name>
- <repertoire>.</repertoire>
- <lien>.</lien>
- <version>'.$l_module_version[$y][$u].'</version>
- </module>
-';
- $u++;
- }
-
- $rec_xml.=' </categorie>
-</channel>
-</rss>';
-
-
+<?php
+ //// Constructeur XML
+ $rec_xml = '<?xml version="1.0" encoding="iso-8859-1"?>
+<rss xmlns:dc="http://purl.org/dc/elements/1.1/" version="2.0">
+<channel>
+';
+ $rec_xml.= ' <categorie name="Multim\xE9dia" repertoire="cinefil.gif">
+';
+ $y = 0;
+ $u = 0;
+ while ($u <= $l_module[$y]) {
+ $rec_xml.=' <module>
+ <name>'.$l_module_name[$y][$u].'</name>
+ <repertoire>'.$l_module_repertoire[$y][$u].'</repertoire>
+ <lien>'.$l_module_lien[$y][$u].'</lien>
+ <actif1>'.$l_module_a1[$y][$u].'</actif1>
+ <actif2>'.$l_module_a2[$y][$u].'</actif2>
+ <actif3>'.$l_module_a3[$y][$u].'</actif3>
+ <actif4>'.$l_module_a4[$y][$u].'</actif4>
+ <actif5>'.$l_module_a5[$y][$u].'</actif5>
+ <version>'.$l_module_version[$y][$u].'</version>
+ </module>
+';
+ $u++;
+ }
+ $rec_xml.= ' </categorie>
+ <categorie name="Cin\xE9ma" repertoire="cinefil.gif">
+';
+ $y++;
+ $u = 0;
+ while ($u <= $l_module[$y]) {
+ $rec_xml.=' <module>
+ <name>'.$l_module_name[$y][$u].'</name>
+ <repertoire>'.$l_module_repertoire[$y][$u].'</repertoire>
+ <lien>'.$l_module_lien[$y][$u].'</lien>
+ <actif1>'.$l_module_a1[$y][$u].'</actif1>
+ <actif2>'.$l_module_a2[$y][$u].'</actif2>
+ <actif3>'.$l_module_a3[$y][$u].'</actif3>
+ <actif4>'.$l_module_a4[$y][$u].'</actif4>
+ <actif5>'.$l_module_a5[$y][$u].'</actif5>
+ <version>'.$l_module_version[$y][$u].'</version>
+ </module>
+';
+ $u++;
+ }
+ $rec_xml.= ' </categorie>
+ <categorie name="Internet" repertoire="firefox.gif">
+';
+ $y++;
+ $u = 0;
+ while ($u <= $l_module[$y]) {
+ $rec_xml.=' <module>
+ <name>'.$l_module_name[$y][$u].'</name>
+ <repertoire>'.$l_module_repertoire[$y][$u].'</repertoire>
+ <lien>'.$l_module_lien[$y][$u].'</lien>
+ <actif1>'.$l_module_a1[$y][$u].'</actif1>
+ <actif2>'.$l_module_a2[$y][$u].'</actif2>
+ <actif3>'.$l_module_a3[$y][$u].'</actif3>
+ <actif4>'.$l_module_a4[$y][$u].'</actif4>
+ <actif5>'.$l_module_a5[$y][$u].'</actif5>
+ <version>'.$l_module_version[$y][$u].'</version>
+ </module>
+'; $u++;
+ }
+ $rec_xml.= ' </categorie>
+ <categorie name="Infos" repertoire="menunews.gif">
+';
+ $y++;
+ $u = 0;
+ while ($u <= $l_module[$y]) {
+ $rec_xml.=' <module>
+ <name>'.$l_module_name[$y][$u].'</name>
+ <repertoire>'.$l_module_repertoire[$y][$u].'</repertoire>
+ <lien>'.$l_module_lien[$y][$u].'</lien>
+ <actif1>'.$l_module_a1[$y][$u].'</actif1>
+ <actif2>'.$l_module_a2[$y][$u].'</actif2>
+ <actif3>'.$l_module_a3[$y][$u].'</actif3>
+ <actif4>'.$l_module_a4[$y][$u].'</actif4>
+ <actif5>'.$l_module_a5[$y][$u].'</actif5>
+ <version>'.$l_module_version[$y][$u].'</version>
+ </module>
+';
+ $u++;
+ }
+ $rec_xml.= ' </categorie>
+ <categorie name="Pratique" repertoire="horloge.gif">
+';
+ $y++;
+ $u = 0;
+ while ($u <= $l_module[$y]) {
+ $rec_xml.=' <module>
+ <name>'.$l_module_name[$y][$u].'</name>
+ <repertoire>'.$l_module_repertoire[$y][$u].'</repertoire>
+ <lien>'.$l_module_lien[$y][$u].'</lien>
+ <actif1>'.$l_module_a1[$y][$u].'</actif1>
+ <actif2>'.$l_module_a2[$y][$u].'</actif2>
+ <actif3>'.$l_module_a3[$y][$u].'</actif3>
+ <actif4>'.$l_module_a4[$y][$u].'</actif4>
+ <actif5>'.$l_module_a5[$y][$u].'</actif5>
+ <version>'.$l_module_version[$y][$u].'</version>
+ </module>
+';
+ $u++;
+ }
+ $rec_xml.= ' </categorie>
+ <categorie name="Suplement">';
+ $y++;
+ $u = 0;
+ while ($u <= $l_module[$y]) {
+ $rec_xml.=' <module>
+ <name>'.$l_module_name[$y][$u].'</name>
+ <repertoire>.</repertoire>
+ <lien>.</lien>
+ <version>'.$l_module_version[$y][$u].'</version>
+ </module>
+';
+ $u++;
+ }
+
+ $rec_xml.=' </categorie>
+</channel>
+</rss>';
+
+
?>
\ No newline at end of file
Property changes on: trunk/_framework/cr_xml.php
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/_framework/demarrage.php
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/_framework/dwl.php
===================================================================
--- trunk/_framework/dwl.php 2007-05-01 15:20:56 UTC (rev 138)
+++ trunk/_framework/dwl.php 2007-05-01 15:26:59 UTC (rev 139)
@@ -1,57 +1,57 @@
-<?php
-$RACINE_REP = "../";
-
-?><html>
-<head>
-<title>T\xE9l\xE9chargement en cours</title>
-<meta name="refresh" content="2;url=/module/maj/index1.php">
-</head>
-<body>
-<?php
-require_once($RACINE_REP.'_framework/framework.php');
-
-$liens = urldecode($_GET['fichier']);
-$nom = urldecode($_GET['nom']);
-$version = urldecode($_GET['version']);
-$description = urldecode($_GET['description']);
-$categorie = urldecode($_GET['categorie']);
-$dwl = $_GET['dwl'];
-
-if($liens){
- if ($dwl== "Skin") {
- $plus = 'skin/'.strtolower(supprime_accents($nom));
- if(module_exists($nom)){
- sup_module(get_id_of_module($nom));
- }
- add_module($nom, $nom.'/', '', '', '', '', '', '', $version, $description, 'Skin', 'Alone', '');
- $txt_dwl = "T\xE9l\xE9chargement de la skin termin\xE9e.";
- $nom = '';
- }elseif($dwl == "Module"){
- $plus = 'module/'.strtolower(str_replace(' ','',supprime_accents($nom)));
- if(module_exists($nom)){
- sup_module(get_id_of_module($nom));
- }
- add_module($nom, strtolower(str_replace(' ','',supprime_accents($nom))).'/', 'index1.php', '1', '1', '1', '1', '1', $version, $description, 'Module', 'Alone', get_id_of_categorie($categorie));
- $txt_dwl = "T\xE9l\xE9chargement du module.";
- }else{
- $plus = '';
- $txt_dwl = "T\xE9l\xE9chargement du patch termin\xE9.";
- change_version('Easybox', $version);
- $nom = '';
- }
-
-///////// T\xE9l\xE9chargement directe pour les skins
- download_file($liens, $RACINE_REP.$plus, $nom);
-
- echo "<center>";
- echo $txt_dwl;
- echo "</center>";
-
-}
-
-?>
-<center><a href="/configuration/configuration.php">Retour \xE0 la configuration</a></center>
-
-</body>
-</html>
-
+<?php
+$RACINE_REP = "../";
+
+?><html>
+<head>
+<title>T\xE9l\xE9chargement en cours</title>
+<meta name="refresh" content="2;url=/module/maj/index1.php">
+</head>
+<body>
+<?php
+require_once($RACINE_REP.'_framework/framework.php');
+
+$liens = urldecode($_GET['fichier']);
+$nom = urldecode($_GET['nom']);
+$version = urldecode($_GET['version']);
+$description = urldecode($_GET['description']);
+$categorie = urldecode($_GET['categorie']);
+$dwl = $_GET['dwl'];
+
+if($liens){
+ if ($dwl== "Skin") {
+ $plus = 'skin/'.strtolower(supprime_accents($nom));
+ if(module_exists($nom)){
+ sup_module(get_id_of_module($nom));
+ }
+ add_module($nom, $nom.'/', '', '', '', '', '', '', $version, $description, 'Skin', 'Alone', '');
+ $txt_dwl = "T\xE9l\xE9chargement de la skin termin\xE9e.";
+ $nom = '';
+ }elseif($dwl == "Module"){
+ $plus = 'module/'.strtolower(str_replace(' ','',supprime_accents($nom)));
+ if(module_exists($nom)){
+ sup_module(get_id_of_module($nom));
+ }
+ add_module($nom, strtolower(str_replace(' ','',supprime_accents($nom))).'/', 'index1.php', '1', '1', '1', '1', '1', $version, $description, 'Module', 'Alone', get_id_of_categorie($categorie));
+ $txt_dwl = "T\xE9l\xE9chargement du module.";
+ }else{
+ $plus = '';
+ $txt_dwl = "T\xE9l\xE9chargement du patch termin\xE9.";
+ change_version('Easybox', $version);
+ $nom = '';
+ }
+
+///////// T\xE9l\xE9chargement directe pour les skins
+ download_file($liens, $RACINE_REP.$plus, $nom);
+
+ echo "<center>";
+ echo $txt_dwl;
+ echo "</center>";
+
+}
+
+?>
+<center><a href="/configuration/configuration.php">Retour \xE0 la configuration</a></center>
+
+</body>
+</html>
+
Property changes on: trunk/_framework/dwl.php
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/_framework/favoris_touches.php
===================================================================
--- trunk/_framework/favoris_touches.php 2007-05-01 15:20:56 UTC (rev 138)
+++ trunk/_framework/favoris_touches.php 2007-05-01 15:26:59 UTC (rev 139)
@@ -1,32 +1,32 @@
-<?php
-$RACINE_REP = "../";
-require($RACINE_REP.'_framework/framework.php');
-
-$touche = 'touche'.$_GET['favoris_touche'];
-if ($touche == "touche0" AND $ini['screensaver']['scr_actif']=='oui') {
- /*$redir = $MODULE."screensaver/index1.php";
- $texte1= "SCREENSAVER<br />";*/
-}else{
- if (($ini['favoris'][$touche] != "." AND $ini['favoris'][$touche]!="") AND $_GET['favoris_touche']) {
- if (@is_dir($ini['favoris'][$touche]) == TRUE) {
- $redir = $RACINE_REP."module/films/index1.php?directory=".$ini['favoris'][$touche];
- $texte1 = 'Redirection vers le dossier demand\xE9.';
- }else{
- $redir = $RACINE_REP."module/".$ini['favoris'][$touche];
- $texte1 = 'Redirection vers le module demand\xE9';
- }
- }else{
- $redir = 'back';
- $texte1 = "Cette touche n'est pas programm\xE9e. Retour \xE0 la page pr\xE9c\xE9dente.";
- }
-}
-
-$LINK['red']= '../module/_menu/menu.php';
-$META['refresh']= '0;url='.$redir;
-
-
-$smarty->assign('TITRE','Redirection en cours...');
-$smarty->assign('AVERTISSEMENT',$texte1);
-$smarty->display('avertissement.tpl');
-
-?>
+<?php
+$RACINE_REP = "../";
+require($RACINE_REP.'_framework/framework.php');
+
+$touche = 'touche'.$_GET['favoris_touche'];
+if ($touche == "touche0" AND $ini['screensaver']['scr_actif']=='oui') {
+ /*$redir = $MODULE."screensaver/index1.php";
+ $texte1= "SCREENSAVER<br />";*/
+}else{
+ if (($ini['favoris'][$touche] != "." AND $ini['favoris'][$touche]!="") AND $_GET['favoris_touche']) {
+ if (@is_dir($ini['favoris'][$touche]) == TRUE) {
+ $redir = $RACINE_REP."module/films/index1.php?directory=".$ini['favoris'][$touche];
+ $texte1 = 'Redirection vers le dossier demand\xE9.';
+ }else{
+ $redir = $RACINE_REP."module/".$ini['favoris'][$touche];
+ $texte1 = 'Redirection vers le module demand\xE9';
+ }
+ }else{
+ $redir = 'back';
+ $texte1 = "Cette touche n'est pas programm\xE9e. Retour \xE0 la page pr\xE9c\xE9dente.";
+ }
+}
+
+$LINK['red']= '../module/_menu/menu.php';
+$META['refresh']= '0;url='.$redir;
+
+
+$smarty->assign('TITRE','Redirection en cours...');
+$smarty->assign('AVERTISSEMENT',$texte1);
+$smarty->display('avertissement.tpl');
+
+?>
Property changes on: trunk/_framework/favoris_touches.php
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/_framework/fonctions_partagees.inc.php
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/_framework/framework.php
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/_framework/img2fbx.php
===================================================================
--- trunk/_framework/img2fbx.php 2007-05-01 15:20:56 UTC (rev 138)
+++ trunk/_framework/img2fbx.php 2007-05-01 15:26:59 UTC (rev 139)
@@ -1,79 +1,79 @@
-<?php
-$RACINE_REP = realpath("../");
-$CACHE_IMAGE = $RACINE_REP."/_utilisateur/cache/";
-
-$sURL=urldecode($_REQUEST['sURL']);
-
-list($width, $height, $type) = getimagesize($sURL);
-
-if (isset($_REQUEST['nbcouleurs'])) {
- $nbcouleurs = $_REQUEST['nbcouleurs'];
-} else {
- $nbcouleurs = 128;
-}
-
-function is_cached($url){
-global $CACHE_IMAGE;
- if(file_exists($CACHE_IMAGE.md5($url).'.gif')){
- RETURN True;
- }else{
- RETURN False;
- }
-}
-
-//R\xE9cup\xE8re l'image dans le cache si il faut
-if(is_cached($sURL.$_REQUEST['new_width'].$_REQUEST['new_height']) && $_REQUEST['cache']==1){
- $oIm = imagecreatefromgif($CACHE_IMAGE.md5($sURL.$_REQUEST['new_width'].$_REQUEST['new_height']).'.gif');
- if(!headers_sent()){
- header('Content-Type: image/gif');
- imagegif($oIm);
- imagedestroy($oIm);
- die();
- }
-}else{
-
-switch($type){
- case 1 : //GIF
- $oIm = imagecreatefromgif($sURL);
- break;
- case 2 : //JPG
- $oIm = imagecreatefromjpeg($sURL);
- break;
- case 3 : // PNG
- $oIm = imagecreatefrompng($sURL);
- break;
-}
-
- if(isset($_REQUEST['new_width']) && isset($_REQUEST['new_height'])){
-
- $colors_handle = ImageCreatetruecolor($_REQUEST['new_width'],$_REQUEST['new_height']);
- imagecopyresampled( $colors_handle, $oIm, 0, 0, 0, 0, $_REQUEST['new_width'], $_REQUEST['new_height'],$width, $height );
- ImageTrueColorToPalette( $colors_handle, false, $nbcouleurs );
-
- if($_REQUEST['cache']==1){
- imagegif($colors_handle,$CACHE_IMAGE.md5($sURL.$_REQUEST['new_width'].$_REQUEST['new_height']).'.gif');
- }
-
- if(!headers_sent()){
- header('Content-Type: image/gif');
- imagegif($colors_handle);
- imagedestroy($oIm);
- ImageDestroy( $colors_handle );
- die();
- }
- }else{
- imagetruecolortopalette($oIm, false, $nbcouleurs);
-
- if($_REQUEST['cache']==1){
- imagegif($oIm,$CACHE_IMAGE.md5($sURL).'.gif');
- }
-
- if(!headers_sent()) {
- header('Content-Type: image/gif');
- imagegif($oIm);
- imagedestroy($oIm);
- die();
- }
- }
-}
-?>
+<?php
+$RACINE_REP = realpath("../");
+$CACHE_IMAGE = $RACINE_REP."/_utilisateur/cache/";
+
+$sURL=urldecode($_REQUEST['sURL']);
+
+list($width, $height, $type) = getimagesize($sURL);
+
+if (isset($_REQUEST['nbcouleurs'])) {
+ $nbcouleurs = $_REQUEST['nbcouleurs'];
+} else {
+ $nbcouleurs = 128;
+}
+
+function is_cached($url){
+global $CACHE_IMAGE;
+ if(file_exists($CACHE_IMAGE.md5($url).'.gif')){
+ RETURN True;
+ }else{
+ RETURN False;
+ }
+}
+
+//R\xE9cup\xE8re l'image dans le cache si il faut
+if(is_cached($sURL.$_REQUEST['new_width'].$_REQUEST['new_height']) && $_REQUEST['cache']==1){
+ $oIm = imagecreatefromgif($CACHE_IMAGE.md5($sURL.$_REQUEST['new_width'].$_REQUEST['new_height']).'.gif');
+ if(!headers_sent()){
+ header('Content-Type: image/gif');
+ imagegif($oIm);
+ imagedestroy($oIm);
+ die();
+ }
+}else{
+
+switch($type){
+ case 1 : //GIF
+ $oIm = imagecreatefromgif($sURL);
+ break;
+ case 2 : //JPG
+ $oIm = imagecreatefromjpeg($sURL);
+ break;
+ case 3 : // PNG
+ $oIm = imagecreatefrompng($sURL);
+ break;
+}
+
+ if(isset($_REQUEST['new_width']) && isset($_REQUEST['new_height'])){
+
+ $colors_handle = ImageCreatetruecolor($_REQUEST['new_width'],$_REQUEST['new_height']);
+ imagecopyresampled( $colors_handle, $oIm, 0, 0, 0, 0, $_REQUEST['new_width'], $_REQUEST['new_height'],$width, $height );
+ ImageTrueColorToPalette( $colors_handle, false, $nbcouleurs );
+
+ if($_REQUEST['cache']==1){
+ imagegif($colors_handle,$CACHE_IMAGE.md5($sURL.$_REQUEST['new_width'].$_REQUEST['new_height']).'.gif');
+ }
+
+ if(!headers_sent()){
+ header('Content-Type: image/gif');
+ imagegif($colors_handle);
+ imagedestroy($oIm);
+ ImageDestroy( $colors_handle );
+ die();
+ }
+ }else{
+ imagetruecolortopalette($oIm, false, $nbcouleurs);
+
+ if($_REQUEST['cache']==1){
+ imagegif($oIm,$CACHE_IMAGE.md5($sURL).'.gif');
+ }
+
+ if(!headers_sent()) {
+ header('Content-Type: image/gif');
+ imagegif($oIm);
+ imagedestroy($oIm);
+ die();
+ }
+ }
+}
+?>
Property changes on: trunk/_framework/img2fbx.php
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/_framework/init_version.php
===================================================================
--- trunk/_framework/init_version.php 2007-05-01 15:20:56 UTC (rev 138)
+++ trunk/_framework/init_version.php 2007-05-01 15:26:59 UTC (rev 139)
@@ -1,24 +1,24 @@
-<?php
-
-//////// R\xE9cuperation des donnees donn\xE9es local
-$mod_name = 'Easybox';
-$mod_version = get_version('Easybox');
-
-$data = "
-<html>
-<head>
-</head>
-<body>
-<h1>".$mod_name."</h1>
-<h2>".$mod_version."</h2>
-</body>
-</html>";
-
-$file = $_SERVER['DOCUMENT_ROOT'].'/version.html';
-
-if ($file_handle = fopen($file,"w")) {
- fwrite($file_handle, $data);
- fclose($file_handle);
-}
-
-?>
+<?php
+
+//////// R\xE9cuperation des donnees donn\xE9es local
+$mod_name = 'Easybox';
+$mod_version = get_version('Easybox');
+
+$data = "
+<html>
+<head>
+</head>
+<body>
+<h1>".$mod_name."</h1>
+<h2>".$mod_version."</h2>
+</body>
+</html>";
+
+$file = $_SERVER['DOCUMENT_ROOT'].'/version.html';
+
+if ($file_handle = fopen($file,"w")) {
+ fwrite($file_handle, $data);
+ fclose($file_handle);
+}
+
+?>
Property changes on: trunk/_framework/init_version.php
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/_framework/lib/Config_File.class.php
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/_framework/lib/Smarty.class.php
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/_framework/lib/Smarty_Compiler.class.php
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/_framework/lib/date.php
===================================================================
--- trunk/_framework/lib/date.php 2007-05-01 15:20:56 UTC (rev 138)
+++ trunk/_framework/lib/date.php 2007-05-01 15:26:59 UTC (rev 139)
@@ -1,119 +1,119 @@
-<?
-/*
- * string dateFr(string format, int timestamp)
- * string dateFr(string format)
- *
- * Retourne une date sous forme d'une cha\xEEne, au format donn\xE9 par la cha\xEEne format.
- * La date est fournie sous la forme d'un timestamp. Par d\xE9faut, la date courante est utilis\xE9e.
- * Les caract\xE8res suivants sont utilis\xE9s pour sp\xE9cifier le format :
- *
- * \xB7 D - Jour de la semaine, en trois lettres : par exemple "Ven" (pour Vendredi)
- * \xB7 l - Jour de la semaine, textuel, version longue; ex: Vendredi
- *
- * \xB7 j - Jour du mois sans les z\xE9ros initiaux: "1" \xE0 "31"
- * \xB7 d - Jour du mois, sur deux chiffres (\xE9ventuellement avec un z\xE9ros) : "01" \xE0 "31"
- *
- * \xB7 n - Mois sans les z\xE9ros initiaux; i.e. "1" \xE0 "12"
- * \xB7 m - Mois; i.e. "01" \xE0 "12"
- * \xB7 M - Mois, en trois lettres : par exemple "Jan" (pour Janvier)
- * \xB7 F - Mois, textuel, version longue; ex: Janvier
- *
- * \xB7 y - Ann\xE9e, 2 chiffres; i.e. "99"
- * \xB7 Y - Ann\xE9e, 4 chiffres; i.e. "1999"
- *
- * \xB7 g - Heure, au format 12h sans les z\xE9ros initiaux, "1" \xE0 "12"
- * \xB7 e - Heure, au format 12h, "01" \xE0 "12"
- * \xB7 G - Heure, au format 24h sans les z\xE9ros initiaux, "0" \xE0 "23"
- * \xB7 E - heure, au format 24h, "00" \xE0 "23"
- *
- * \xB7 i - Minutes; "00" \xE0 "59"
- *
- * \xB7 s - Secondes; i.e. "00" \xE0 "59"
- *
- */
-
-function dateFr($format, $date= '') {
- $dateRetour = "";
- if ($date=='')
- $date = mktime(date('H'), date('i'), date('s'), date('m'), date('d'), date('Y'), -1);
- $TJour = array("Dimanche","Lundi","Mardi","Mercredi","Jeudi","Vendredi","Samedi");
- $TMois = array("Janvier","Fevrier","Mars","Avril","Mai","Juin","Juillet","Aout","Septembre","Octobre","Novembre","D\xE9cembre");
-
- for($i=0; $i<strlen($format); $i++) {
- $char = substr($format, $i, 1);
- switch($char) {
- case 'd' : $dateRetour .= date('d', $date); break;
- case 'D' : $dateRetour .= substr($TJour[date('w', $date)],0,3); break;
- case 'F' : $dateRetour .= $TMois[date('n', $date)-1]; break;
- case 'e' : $dateRetour .= date('h', $date); break;
- case 'E' : $dateRetour .= date('H', $date); break;
- case 'g' : $dateRetour .= date('g', $date); break;
- case 'G' : $dateRetour .= date('G', $date); break;
- case 'i' : $dateRetour .= date('i', $date); break;
- case 'j' : $dateRetour .= date('j', $date); break;
- case 'l' : $dateRetour .= $TJour[date('w', $date)]; break;
- case 'm' : $dateRetour .= date('m', $date); break;
- case 'n' : $dateRetour .= date('n', $date); break;
- case 'M' : $dateRetour .= substr($TMois[date('n', $date)-1],0,3); break;
- case 's' : $dateRetour .= date('s', $date); break;
- case 'Y' : $dateRetour .= date('Y', $date); break;
- case 'y' : $dateRetour .= date('y', $date); break;
- default : $dateRetour .= $char;
- }
- }
- return($dateRetour);
-}
-
-/*
- * int mkdate(String date)
- *
- * Retourne une date sous forme d'un entier timestamp \xE0 partir d'une chaine de la forme "AAAAMMJJ".
- */
-
-function mkDate($chaineDate) {
- return(mktime(0, 0, 0, substr($chaineDate,4,2), substr($chaineDate,6,2), substr($chaineDate,0,4), -1));
-}
-
-/*
- * int mkDateHeure(String date)
- *
- * Retourne une date sous forme d'un entier timestamp \xE0 partir d'une chaine de la forme "AAAAMMJJHHMMSS".
- */
-
-function mkDateHeure($chaineDate) {
- return(mktime(substr($chaineDate,8,2), substr($chaineDate,10,2), substr($chaineDate,12,2), substr($chaineDate,4,2), substr($chaineDate,6,2), substr($chaineDate,0,4), -1));
-}
-
-/*
- * int nbJour(String mois)
- * int nbJour(String mois, String ann\xE9e)
- *
- * Retourne le nombre de jour du mois pass\xE9 en param\xE8tre
- * mois compris entre 1 et 12
- *
- */
-
-function nbJour($Mois, $Annee) {
- return(date("t", mktime(0,0,0,$Mois,1,$Annee)));
-}
-
-/*
- * String mois(String date)
- *
- * Retourne le numero de mois "MM" d'une date de la forme "AAAAMMJJ"
- */
-
-function mois($date) {
- return(substr($date,4,2));
-}
-
-/*
- * String jour(String date)
- *
- * Retourne le numero du jour "JJ" d'une date de la forme "AAAAMMJJ"
- */
-
-function jour($date) {
- return(substr($date,6,2));
-}
+<?
+/*
+ * string dateFr(string format, int timestamp)
+ * string dateFr(string format)
+ *
+ * Retourne une date sous forme d'une cha\xEEne, au format donn\xE9 par la cha\xEEne format.
+ * La date est fournie sous la forme d'un timestamp. Par d\xE9faut, la date courante est utilis\xE9e.
+ * Les caract\xE8res suivants sont utilis\xE9s pour sp\xE9cifier le format :
+ *
+ * \xB7 D - Jour de la semaine, en trois lettres : par exemple "Ven" (pour Vendredi)
+ * \xB7 l - Jour de la semaine, textuel, version longue; ex: Vendredi
+ *
+ * \xB7 j - Jour du mois sans les z\xE9ros initiaux: "1" \xE0 "31"
+ * \xB7 d - Jour du mois, sur deux chiffres (\xE9ventuellement avec un z\xE9ros) : "01" \xE0 "31"
+ *
+ * \xB7 n - Mois sans les z\xE9ros initiaux; i.e. "1" \xE0 "12"
+ * \xB7 m - Mois; i.e. "01" \xE0 "12"
+ * \xB7 M - Mois, en trois lettres : par exemple "Jan" (pour Janvier)
+ * \xB7 F - Mois, textuel, version longue; ex: Janvier
+ *
+ * \xB7 y - Ann\xE9e, 2 chiffres; i.e. "99"
+ * \xB7 Y - Ann\xE9e, 4 chiffres; i.e. "1999"
+ *
+ * \xB7 g - Heure, au format 12h sans les z\xE9ros initiaux, "1" \xE0 "12"
+ * \xB7 e - Heure, au format 12h, "01" \xE0 "12"
+ * \xB7 G - Heure, au format 24h sans les z\xE9ros initiaux, "0" \xE0 "23"
+ * \xB7 E - heure, au format 24h, "00" \xE0 "23"
+ *
+ * \xB7 i - Minutes; "00" \xE0 "59"
+ *
+ * \xB7 s - Secondes; i.e. "00" \xE0 "59"
+ *
+ */
+
+function dateFr($format, $date= '') {
+ $dateRetour = "";
+ if ($date=='')
+ $date = mktime(date('H'), date('i'), date('s'), date('m'), date('d'), date('Y'), -1);
+ $TJour = array("Dimanche","Lundi","Mardi","Mercredi","Jeudi","Vendredi","Samedi");
+ $TMois = array("Janvier","Fevrier","Mars","Avril","Mai","Juin","Juillet","Aout","Septembre","Octobre","Novembre","D\xE9cembre");
+
+ for($i=0; $i<strlen($format); $i++) {
+ $char = substr($format, $i, 1);
+ switch($char) {
+ case 'd' : $dateRetour .= date('d', $date); break;
+ case 'D' : $dateRetour .= substr($TJour[date('w', $date)],0,3); break;
+ case 'F' : $dateRetour .= $TMois[date('n', $date)-1]; break;
+ case 'e' : $dateRetour .= date('h', $date); break;
+ case 'E' : $dateRetour .= date('H', $date); break;
+ case 'g' : $dateRetour .= date('g', $date); break;
+ case 'G' : $dateRetour .= date('G', $date); break;
+ case 'i' : $dateRetour .= date('i', $date); break;
+ case 'j' : $dateRetour .= date('j', $date); break;
+ case 'l' : $dateRetour .= $TJour[date('w', $date)]; break;
+ case 'm' : $dateRetour .= date('m', $date); break;
+ case 'n' : $dateRetour .= date('n', $date); break;
+ case 'M' : $dateRetour .= substr($TMois[date('n', $date)-1],0,3); break;
+ case 's' : $dateRetour .= date('s', $date); break;
+ case 'Y' : $dateRetour .= date('Y', $date); break;
+ case 'y' : $dateRetour .= date('y', $date); break;
+ default : $dateRetour .= $char;
+ }
+ }
+ return($dateRetour);
+}
+
+/*
+ * int mkdate(String date)
+ *
+ * Retourne une date sous forme d'un entier timestamp \xE0 partir d'un...
[truncated message content] |
|
From: <gu...@us...> - 2007-05-01 15:20:58
|
Revision: 138
http://svn.sourceforge.net/easybox-mod/?rev=138&view=rev
Author: guyou
Date: 2007-05-01 08:20:56 -0700 (Tue, 01 May 2007)
Log Message:
-----------
Ajout svn:eol-style=native sur fichiers .tpl (#1699723)
Modified Paths:
--------------
trunk/module/_explorateur/explorateur.tpl
trunk/module/allocine/allocine.tpl
trunk/module/cac40/cac40.tpl
trunk/module/clips/clips.tpl
trunk/module/dailymotion/dailymotion.tpl
trunk/module/diaporama/explorateur_photo.tpl
trunk/module/dvd/dvd.tpl
trunk/module/dvd/menu_dvd.tpl
trunk/module/ephemeride/ephemeride.tpl
trunk/module/favoris/favoris.tpl
trunk/module/films/catalogue_video.tpl
trunk/module/films/fichefilm.tpl
trunk/module/films/signet_ask.tpl
trunk/module/films/signet_film.tpl
trunk/module/guidetv/guidetv.tpl
trunk/module/horoscope/horoscope.tpl
trunk/module/infotrafic/info-trafic.tpl
trunk/module/jt/emissions.tpl
trunk/module/livescore/livescore.tpl
trunk/module/loto/loto.tpl
trunk/module/mail/mail_inbox.tpl
trunk/module/mail/mail_message.tpl
trunk/module/meteo/meteoft.tpl
trunk/module/modules/modules.tpl
trunk/module/mp3/audio.tpl
trunk/module/mp3/podcast.tpl
trunk/module/multiposte/enregistrement_add.tpl
trunk/module/othello/othello.tpl
trunk/module/recettes/recettes.tpl
trunk/module/recettes/recettes2.tpl
trunk/module/reseaufree/reseaufree.tpl
trunk/module/rss/rss.tpl
trunk/module/seances/programme_cine.tpl
trunk/module/signet/signet.tpl
trunk/module/webmedia/webmedias.tpl
trunk/module/youtube/youtube.tpl
trunk/skin/mediacenter/avertissement.tpl
trunk/skin/mediacenter/bouton.tpl
trunk/skin/mediacenter/cartouche.tpl
trunk/skin/mediacenter/demarrage.tpl
trunk/skin/mediacenter/explorateur.tpl
trunk/skin/mediacenter/generique.tpl
trunk/skin/mediacenter/menu.tpl
trunk/skin/simple/avertissement.tpl
trunk/skin/simple/bouton.tpl
trunk/skin/simple/demarrage.tpl
trunk/skin/simple/generique.tpl
trunk/skin/simple/interface.tpl
trunk/skin/simple/menu.tpl
trunk/skin/simplegreen/avertissement.tpl
trunk/skin/simplegreen/bouton.tpl
trunk/skin/simplegreen/demarrage.tpl
trunk/skin/simplegreen/generique.tpl
trunk/skin/simplegreen/interface.tpl
trunk/skin/simplegreen/menu.tpl
Property Changed:
----------------
trunk/_framework/lib/debug.tpl
trunk/module/_explorateur/explorateur.tpl
trunk/module/allocine/allocine.tpl
trunk/module/cac40/cac40.tpl
trunk/module/cinefil/sorties_cine.tpl
trunk/module/clips/clips.tpl
trunk/module/dailymotion/dailymotion.tpl
trunk/module/diaporama/explorateur_photo.tpl
trunk/module/diaporama/photo.tpl
trunk/module/dvd/dvd.tpl
trunk/module/dvd/menu_dvd.tpl
trunk/module/ephemeride/ephemeride.tpl
trunk/module/favoris/favoris.tpl
trunk/module/films/catalogue_video.tpl
trunk/module/films/fichefilm.tpl
trunk/module/films/films.tpl
trunk/module/films/signet_ask.tpl
trunk/module/films/signet_film.tpl
trunk/module/guidetv/guidetv.tpl
trunk/module/horloge/horloge.tpl
trunk/module/horoscope/horoscope.tpl
trunk/module/infotrafic/info-trafic.tpl
trunk/module/jt/emissions.tpl
trunk/module/livescore/livescore.tpl
trunk/module/loto/loto.tpl
trunk/module/mail/mail_inbox.tpl
trunk/module/mail/mail_message.tpl
trunk/module/meteo/meteoft.tpl
trunk/module/modules/modules.tpl
trunk/module/mp3/audio.tpl
trunk/module/mp3/catalogue_audio.tpl
trunk/module/mp3/playlist_audio.tpl
trunk/module/mp3/podcast.tpl
trunk/module/multiposte/enregistrement.tpl
trunk/module/multiposte/enregistrement_add.tpl
trunk/module/othello/othello.tpl
trunk/module/recettes/recettes.tpl
trunk/module/recettes/recettes2.tpl
trunk/module/reseaufree/reseaufree.tpl
trunk/module/rss/rss.tpl
trunk/module/seances/programme_cine.tpl
trunk/module/signet/signet.tpl
trunk/module/webmedia/webmedias.tpl
trunk/module/youtube/youtube.tpl
trunk/skin/mediacenter/avertissement.tpl
trunk/skin/mediacenter/bouton.tpl
trunk/skin/mediacenter/cartouche.tpl
trunk/skin/mediacenter/demarrage.tpl
trunk/skin/mediacenter/explorateur.tpl
trunk/skin/mediacenter/films.tpl
trunk/skin/mediacenter/generique.tpl
trunk/skin/mediacenter/interface.tpl
trunk/skin/mediacenter/menu.tpl
trunk/skin/simple/avertissement.tpl
trunk/skin/simple/bouton.tpl
trunk/skin/simple/demarrage.tpl
trunk/skin/simple/generique.tpl
trunk/skin/simple/interface.tpl
trunk/skin/simple/menu.tpl
trunk/skin/simplegreen/avertissement.tpl
trunk/skin/simplegreen/bouton.tpl
trunk/skin/simplegreen/demarrage.tpl
trunk/skin/simplegreen/generique.tpl
trunk/skin/simplegreen/interface.tpl
trunk/skin/simplegreen/menu.tpl
Property changes on: trunk/_framework/lib/debug.tpl
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/module/_explorateur/explorateur.tpl
===================================================================
--- trunk/module/_explorateur/explorateur.tpl 2007-05-01 15:16:44 UTC (rev 137)
+++ trunk/module/_explorateur/explorateur.tpl 2007-05-01 15:20:56 UTC (rev 138)
@@ -1,168 +1,168 @@
-{assign var=rep_encoded value=$REP|urlencode}
-{section name=disques loop=$DISQUES}
- {if $smarty.section.disques.first}
- <table cellspacing="2" align="center" width="498" valign="middle"><tr valign="middle">
- {/if}
- {if $DISQUES[disques].path == 'reload'}
- <td valign="middle" width="50"><img src="{$SKIN_REP}dossier/{$DISQUES[disques].gif}.gif" width="16" height="16"><font size='1'><a href="{$PAGE_EXPLO}?directory={$REP|urlencode}&mode={$MODE}&reload=1&start={$MIN}" onfocus='aide="Scanner \xE0 nouveau les disques et lecteurs disponibles";'>Rafr.</a></font></td>
- {else}
- <td valign="middle"><img src="{$SKIN_REP}dossier/{$DISQUES[disques].gif}.gif" width="16" height="16"><font size='1'><a href="{$PAGE_EXPLO}?directory={$DISQUES[disques].path|urlencode}&mode={$MODE}">{$DISQUES[disques].lettre|strtolower}</a></font></td>
- {/if}
- {if $smarty.section.disques.last}
- </tr></table>
- {/if}
-{/section}
-
-{section name=path loop=$CHEMIN_REP}
- {if $smarty.section.path.first}
- <table align="center" cellpadding="0" cellspacing="0" width="498" valign="middle"><tr valign="middle"><tr><td align="center"><font size="1">
- {/if}
- <a href="{$PAGE_EXPLO}?directory={$CHEMIN_REP[path].0}&mode={$MODE}">{$CHEMIN_REP[path].1|strip_delimiters|truncate:20:"...":true:true}/</a>
- {if $smarty.section.path.last}
- </td></tr></table></font></center>
- {/if}
-{/section}
-
-{if $AFF_CDDA}
- <a href="playdb.php?type=cdda&disque={$LETTRE_CDDA}">Lire {$LETTRE_CDDA}: en tant que cd</a>
-{/if}
-
-{assign var=NUM_ROW_AFFICH value=14}
-
-<table width="498" cellpadding="0" cellspacing="0" align="center" valign="middle">
-
-{assign var=N_affich value=$T_affich|@count}
-{assign var=N_affich_reste value=$NUM_ROW_AFFICH|max:15}
-
-
-{*########## Affichage des raccourcis rapides ##########*}
-{assign var=curIndex value=1}
-{assign var=curTD value=0}
-{assign var=curTR value=0}
-{assign var=FromValue value=""}
-{assign var=ToValue value=""}
-
-{* Nombre de page et pr\xE9paration de la limitation \xE0 10 blocs *}
-{assign var=nb_page value=$N_affich/$NUM_ROW_AFFICH|ceil}
-{assign var=nb_page_par_case value=$nb_page/10|ceil}
-
-{* Il faut d\xE9terminer le nombre de caract\xE8re pour afficher le nom des fichiers dans les blocs d'index*}
-{if $T_affich|@count/$NUM_ROW_AFFICH<=1}
- {assign var=indexLength value=0}
-{elseif $T_affich|@count/$NUM_ROW_AFFICH<=3}
- {assign var=indexLength value=8}
-{elseif $T_affich|@count/$NUM_ROW_AFFICH<=5}
- {assign var=indexLength value=5}
-{elseif $T_affich|@count/$NUM_ROW_AFFICH<=7}
- {assign var=indexLength value=2}
-{else}
- {assign var=indexLength value=1}
-{/if}
-
-{if $indexLength>0}
- {section name=quickjump loop=$T_affich start=0}
- {if $smarty.section.quickjump.first}
- <tr><td colspan="2"><table cellspacing="2" align="center" width="498" valign="middle" border="0"><tr valign="middle">
- {/if}
- {if $curIndex==1}
- {assign var=FromValue value=$T_affich[quickjump]|strip_delimiters|truncate:$indexLength:"":true}
- {if $T_affich[quickjump]|in_array:$T_rep}
- {assign var=FromValue value=$FromValue|upper}
- {else}
- {assign var=FromValue value=$FromValue|lower}
- {/if}
- {/if}
- {assign var=ToValue value=$T_affich[quickjump]|strip_delimiters|truncate:$indexLength:"":true}
- {if $T_affich[quickjump]|in_array:$T_rep}
- {assign var=ToValue value=$ToValue|upper}
- {else}
- {assign var=ToValue value=$ToValue|lower}
- {/if}
-
- {* Si l'on a le nombre de fichier par page ou que c'est le dernier, alors il faut \xE9crire le bloc*}
- {if $curIndex==$nb_page_par_case*$NUM_ROW_AFFICH OR $smarty.section.quickjump.last}
- <td valign="middle" border="1" align="center"><font size='1'><a href="{$PAGE_EXPLO}?start={$curTR*10+$curTD*$NUM_ROW_AFFICH*$nb_page_par_case}&directory={$REP|urlencode}&mode={$MODE}">{$FromValue} .. {$ToValue}</a></font></td>
- {assign var=curTD value=$curTD+1}
-
- {* Chaque ligne du tableau ne peut pas d\xE9passer 10 cellules *}
- {assign var=curIndex value=0}
- {/if}
-
- {* On incr\xE9mente l'index du fichier trait\xE9*}
- {assign var=curIndex value=$curIndex+1}
- {if $smarty.section.quickjump.last}
- </tr></table></td></tr>
- {/if}
- {/section}
-{/if}
-
-{*######## Fin Affichage des raccourcis rapides ########*}
-
-{if $MIN!=0}
- <tr><td colspan="2">{precedent} <a href="{$PAGE_EXPLO}?start=0&directory={$REP|urlencode}&mode={$MODE}"><font size=2>D\xE9but du r\xE9pertoire</font></a></td></tr>
- {/if}
-
-{if $Nb_rep_path >='2' AND $MIN==0}
-{assign var=temp value=$REP|dirname|realpath|urlencode}
-<tr><td colspan="2"><img src="{$INTERFACE_REP}btn_jaune.gif" border="0"> <a focused href="{$PAGE_EXPLO}?directory={$REP|dirname|realpath|urlencode}&mode={$MODE}" onfocus='aide="Dossier parent";'><font size="2">Dossier parent</font></a></td></tr>
-{attribbouton touche="yellow" lien="$PAGE_EXPLO?directory=$temp&mode=$MODE"}
-{elseif $Nb_rep_path >='2'}
-{assign var=temp value=$REP|dirname|realpath|urlencode}
-{attribbouton touche="yellow" lien="$PAGE_EXPLO?directory=$temp&mode=$MODE"}
-{/if}
-
-
-{section name=files loop=$T_affich max=$NUM_ROW_AFFICH start=$MIN}
- {if $T_affich[files]|in_array:$T_rep}
- {assign var="rep_a_affich" value=$REP|cat:'/'|cat:$T_affich[files]}
-<tr><td colspan="2"><img src="{$SKIN_REP}dossier/folder.gif"> <font size="1"><a {if $smarty.section.disques.first==1}focused {/if}href="{$PAGE_EXPLO}?directory={$rep_a_affich|realpath|urlencode}&mode={$MODE}" onfocus='aide="Explorer {$T_affich[files]|strip_delimiters|replace:"'":"`"}";'>{$T_affich[files]|truncate:55|strip_delimiters}</a></font></td></tr>
- {else}
-<tr>
- {if $AFF_INFO}
- <td width="35">
- {assign var="nb" value=$T_affich[files]|strrpos:"."}
- <a href="fichefilm.php?start={$MIN}&comeback=expl&film={$T_affich[files]|substr:0:$nb|urlencode}&fichier={$REP|cat:'/'|cat:$T_affich[files]|realpath|urlencode}" onfocus='aide="Afficher les informations sur {$T_affich[files]|strip_delimiters|replace:"'":"`"}";'><table width="20" height="20" border="0" cellpadding="0" cellspacing="0" bgcolor="{#COULEUR_FOND1#}" abgcolor="{#COULEUR_ALINK#}"><tr height="20"><td align=center width="20" height="20" align="center" valign="middle"><img src="{$INTERFACE_REP}/information.gif" border="0" width="20" height="20"></td></tr></table></a>
- </td>
- {elseif $LECTEUR_AUDIO}
- <td width="60">
- <table cellpadding="0" cellspacing="0" width="60"><tr><td width="30">
- <a href="{$PAGE_LECT}?{$OPT_LIENS}toplay_file={$T_affich[files]|urlencode}&toplay_rep={$REP|urlencode}"><table width="20" height="20" border="0" cellpadding="0" cellspacing="0" bgcolor="{#COULEUR_FOND2#}" abgcolor="{#COULEUR_ALINK#}"><tr height="20"><td align=center width="20" height="20" align="center" valign="middle"><img src="{$INTERFACE_REP}/jouer.gif" border="0" width="20" height="20"></td></tr></table></a>
- </td><td width="30">
- <a href="{$PAGE_LECT}?{$OPT_LIENS}toplay_file={$T_affich[files]|urlencode}&toplay_rep={$REP|urlencode}&option=1"><table width="20" height="20" border="0" cellpadding="0" cellspacing="0" bgcolor="{#COULEUR_FOND2#}" abgcolor="{#COULEUR_ALINK#}"><tr height="20"><td align=center width="20" height="20" align="center" valign="middle"><img src="{$INTERFACE_REP}/ajouter.gif" border="0" width="20" height="20"></td></tr></table></a>
- </td></tr></table>
- </td>
- {else}
- <td></td>
- {/if}
-
- <td>
- {if (NOT $AFF_INFO) AND (NOT $LECTEUR_AUDIO)}<img src="{$SKIN_REP}dossier/{$ICONE_FICHIER}" width="16" height="16"> {/if}
- <font size="1"><a {if $smarty.section.disques.first==1}focused {/if}href="{$PAGE_LECT}?{$OPT_LIENS}toplay_file={$T_affich[files]|urlencode}&toplay_rep={$REP|urlencode}" onfocus='aide="Jouer {$T_affich[files]|strip_delimiters|replace:"'":"`"}";'>{$T_affich[files]|strip_delimiters|truncate:52}</a></font>
-
- </td></tr>
- {/if}
-{/section}
-
-{if $MIN+$smarty.section.files.total<count($T_affich)}
- <tr><td colspan="2"><table><tr><td>{suivant} - <font size=2><a href="{$PAGE_EXPLO}?start={$N_affich-$smarty.section.files.total}&directory={$REP|urlencode}&mode={$MODE}">Fin du r\xE9pertoire</a> - Page {$MIN/$NUM_ROW_AFFICH+1|ceil} / {$N_affich/$NUM_ROW_AFFICH|ceil}</font></td>
-{else}
- <tr><td colspan="2"><table><tr><td><font size=2>Page {$MIN/$NUM_ROW_AFFICH+1|ceil} / {$N_affich/$NUM_ROW_AFFICH|ceil}</font></td>
-{/if}
-
-
-<td width="30" align="center">
-{if $PLAYREP}
-<a href="{$PAGE_LECT_REP}?toplay={$REP|urlencode}&type=playrep" onfocus='aide="Lire le dossier en entier";'><table width="20" height="20" border="0" cellpadding="0" cellspacing="0" bgcolor="{#COULEUR_FOND1#}" abgcolor="{#COULEUR_ALINK#}"><tr height="20"><td align=center width="20" height="20" align="center" valign="middle"><img src="{$SKIN_REP}dossier/rep_all.gif" border="0" width="20" height="20"></td></tr></table></a>
-{/if}
-</td><td width="30" align="center">
-{if $AFF_FAVORIS}
-<a href="{$RACINE_REP}module/favoris/index1.php?ajout={$REP|urlencode}&nom={$REP}" onfocus='aide="Ajouter le dossier aux favoris";'><table width="20" height="20" border="0" cellpadding="0" cellspacing="0" bgcolor="{#COULEUR_FOND1#}" abgcolor="{#COULEUR_ALINK#}"><tr height="20"><td align=center width="20" height="20" align="center" valign="middle"><img src="{$SKIN_REP}dossier/favoris.gif" border="0" width="20" height="20"></td></tr></table></a>
-{/if}
-</td></tr></table>
-</td></tr>
-
-{if $dvdmod}
-<tr><td colspan="2"><a href="index1.php?status=disques">Cliquez ici pour lire un dvd depuis un lecteur optique.</a></td></tr>
-{/if}
-</table>
-{$FOOTER}
+{assign var=rep_encoded value=$REP|urlencode}
+{section name=disques loop=$DISQUES}
+ {if $smarty.section.disques.first}
+ <table cellspacing="2" align="center" width="498" valign="middle"><tr valign="middle">
+ {/if}
+ {if $DISQUES[disques].path == 'reload'}
+ <td valign="middle" width="50"><img src="{$SKIN_REP}dossier/{$DISQUES[disques].gif}.gif" width="16" height="16"><font size='1'><a href="{$PAGE_EXPLO}?directory={$REP|urlencode}&mode={$MODE}&reload=1&start={$MIN}" onfocus='aide="Scanner \xE0 nouveau les disques et lecteurs disponibles";'>Rafr.</a></font></td>
+ {else}
+ <td valign="middle"><img src="{$SKIN_REP}dossier/{$DISQUES[disques].gif}.gif" width="16" height="16"><font size='1'><a href="{$PAGE_EXPLO}?directory={$DISQUES[disques].path|urlencode}&mode={$MODE}">{$DISQUES[disques].lettre|strtolower}</a></font></td>
+ {/if}
+ {if $smarty.section.disques.last}
+ </tr></table>
+ {/if}
+{/section}
+
+{section name=path loop=$CHEMIN_REP}
+ {if $smarty.section.path.first}
+ <table align="center" cellpadding="0" cellspacing="0" width="498" valign="middle"><tr valign="middle"><tr><td align="center"><font size="1">
+ {/if}
+ <a href="{$PAGE_EXPLO}?directory={$CHEMIN_REP[path].0}&mode={$MODE}">{$CHEMIN_REP[path].1|strip_delimiters|truncate:20:"...":true:true}/</a>
+ {if $smarty.section.path.last}
+ </td></tr></table></font></center>
+ {/if}
+{/section}
+
+{if $AFF_CDDA}
+ <a href="playdb.php?type=cdda&disque={$LETTRE_CDDA}">Lire {$LETTRE_CDDA}: en tant que cd</a>
+{/if}
+
+{assign var=NUM_ROW_AFFICH value=14}
+
+<table width="498" cellpadding="0" cellspacing="0" align="center" valign="middle">
+
+{assign var=N_affich value=$T_affich|@count}
+{assign var=N_affich_reste value=$NUM_ROW_AFFICH|max:15}
+
+
+{*########## Affichage des raccourcis rapides ##########*}
+{assign var=curIndex value=1}
+{assign var=curTD value=0}
+{assign var=curTR value=0}
+{assign var=FromValue value=""}
+{assign var=ToValue value=""}
+
+{* Nombre de page et pr\xE9paration de la limitation \xE0 10 blocs *}
+{assign var=nb_page value=$N_affich/$NUM_ROW_AFFICH|ceil}
+{assign var=nb_page_par_case value=$nb_page/10|ceil}
+
+{* Il faut d\xE9terminer le nombre de caract\xE8re pour afficher le nom des fichiers dans les blocs d'index*}
+{if $T_affich|@count/$NUM_ROW_AFFICH<=1}
+ {assign var=indexLength value=0}
+{elseif $T_affich|@count/$NUM_ROW_AFFICH<=3}
+ {assign var=indexLength value=8}
+{elseif $T_affich|@count/$NUM_ROW_AFFICH<=5}
+ {assign var=indexLength value=5}
+{elseif $T_affich|@count/$NUM_ROW_AFFICH<=7}
+ {assign var=indexLength value=2}
+{else}
+ {assign var=indexLength value=1}
+{/if}
+
+{if $indexLength>0}
+ {section name=quickjump loop=$T_affich start=0}
+ {if $smarty.section.quickjump.first}
+ <tr><td colspan="2"><table cellspacing="2" align="center" width="498" valign="middle" border="0"><tr valign="middle">
+ {/if}
+ {if $curIndex==1}
+ {assign var=FromValue value=$T_affich[quickjump]|strip_delimiters|truncate:$indexLength:"":true}
+ {if $T_affich[quickjump]|in_array:$T_rep}
+ {assign var=FromValue value=$FromValue|upper}
+ {else}
+ {assign var=FromValue value=$FromValue|lower}
+ {/if}
+ {/if}
+ {assign var=ToValue value=$T_affich[quickjump]|strip_delimiters|truncate:$indexLength:"":true}
+ {if $T_affich[quickjump]|in_array:$T_rep}
+ {assign var=ToValue value=$ToValue|upper}
+ {else}
+ {assign var=ToValue value=$ToValue|lower}
+ {/if}
+
+ {* Si l'on a le nombre de fichier par page ou que c'est le dernier, alors il faut \xE9crire le bloc*}
+ {if $curIndex==$nb_page_par_case*$NUM_ROW_AFFICH OR $smarty.section.quickjump.last}
+ <td valign="middle" border="1" align="center"><font size='1'><a href="{$PAGE_EXPLO}?start={$curTR*10+$curTD*$NUM_ROW_AFFICH*$nb_page_par_case}&directory={$REP|urlencode}&mode={$MODE}">{$FromValue} .. {$ToValue}</a></font></td>
+ {assign var=curTD value=$curTD+1}
+
+ {* Chaque ligne du tableau ne peut pas d\xE9passer 10 cellules *}
+ {assign var=curIndex value=0}
+ {/if}
+
+ {* On incr\xE9mente l'index du fichier trait\xE9*}
+ {assign var=curIndex value=$curIndex+1}
+ {if $smarty.section.quickjump.last}
+ </tr></table></td></tr>
+ {/if}
+ {/section}
+{/if}
+
+{*######## Fin Affichage des raccourcis rapides ########*}
+
+{if $MIN!=0}
+ <tr><td colspan="2">{precedent} <a href="{$PAGE_EXPLO}?start=0&directory={$REP|urlencode}&mode={$MODE}"><font size=2>D\xE9but du r\xE9pertoire</font></a></td></tr>
+ {/if}
+
+{if $Nb_rep_path >='2' AND $MIN==0}
+{assign var=temp value=$REP|dirname|realpath|urlencode}
+<tr><td colspan="2"><img src="{$INTERFACE_REP}btn_jaune.gif" border="0"> <a focused href="{$PAGE_EXPLO}?directory={$REP|dirname|realpath|urlencode}&mode={$MODE}" onfocus='aide="Dossier parent";'><font size="2">Dossier parent</font></a></td></tr>
+{attribbouton touche="yellow" lien="$PAGE_EXPLO?directory=$temp&mode=$MODE"}
+{elseif $Nb_rep_path >='2'}
+{assign var=temp value=$REP|dirname|realpath|urlencode}
+{attribbouton touche="yellow" lien="$PAGE_EXPLO?directory=$temp&mode=$MODE"}
+{/if}
+
+
+{section name=files loop=$T_affich max=$NUM_ROW_AFFICH start=$MIN}
+ {if $T_affich[files]|in_array:$T_rep}
+ {assign var="rep_a_affich" value=$REP|cat:'/'|cat:$T_affich[files]}
+<tr><td colspan="2"><img src="{$SKIN_REP}dossier/folder.gif"> <font size="1"><a {if $smarty.section.disques.first==1}focused {/if}href="{$PAGE_EXPLO}?directory={$rep_a_affich|realpath|urlencode}&mode={$MODE}" onfocus='aide="Explorer {$T_affich[files]|strip_delimiters|replace:"'":"`"}";'>{$T_affich[files]|truncate:55|strip_delimiters}</a></font></td></tr>
+ {else}
+<tr>
+ {if $AFF_INFO}
+ <td width="35">
+ {assign var="nb" value=$T_affich[files]|strrpos:"."}
+ <a href="fichefilm.php?start={$MIN}&comeback=expl&film={$T_affich[files]|substr:0:$nb|urlencode}&fichier={$REP|cat:'/'|cat:$T_affich[files]|realpath|urlencode}" onfocus='aide="Afficher les informations sur {$T_affich[files]|strip_delimiters|replace:"'":"`"}";'><table width="20" height="20" border="0" cellpadding="0" cellspacing="0" bgcolor="{#COULEUR_FOND1#}" abgcolor="{#COULEUR_ALINK#}"><tr height="20"><td align=center width="20" height="20" align="center" valign="middle"><img src="{$INTERFACE_REP}/information.gif" border="0" width="20" height="20"></td></tr></table></a>
+ </td>
+ {elseif $LECTEUR_AUDIO}
+ <td width="60">
+ <table cellpadding="0" cellspacing="0" width="60"><tr><td width="30">
+ <a href="{$PAGE_LECT}?{$OPT_LIENS}toplay_file={$T_affich[files]|urlencode}&toplay_rep={$REP|urlencode}"><table width="20" height="20" border="0" cellpadding="0" cellspacing="0" bgcolor="{#COULEUR_FOND2#}" abgcolor="{#COULEUR_ALINK#}"><tr height="20"><td align=center width="20" height="20" align="center" valign="middle"><img src="{$INTERFACE_REP}/jouer.gif" border="0" width="20" height="20"></td></tr></table></a>
+ </td><td width="30">
+ <a href="{$PAGE_LECT}?{$OPT_LIENS}toplay_file={$T_affich[files]|urlencode}&toplay_rep={$REP|urlencode}&option=1"><table width="20" height="20" border="0" cellpadding="0" cellspacing="0" bgcolor="{#COULEUR_FOND2#}" abgcolor="{#COULEUR_ALINK#}"><tr height="20"><td align=center width="20" height="20" align="center" valign="middle"><img src="{$INTERFACE_REP}/ajouter.gif" border="0" width="20" height="20"></td></tr></table></a>
+ </td></tr></table>
+ </td>
+ {else}
+ <td></td>
+ {/if}
+
+ <td>
+ {if (NOT $AFF_INFO) AND (NOT $LECTEUR_AUDIO)}<img src="{$SKIN_REP}dossier/{$ICONE_FICHIER}" width="16" height="16"> {/if}
+ <font size="1"><a {if $smarty.section.disques.first==1}focused {/if}href="{$PAGE_LECT}?{$OPT_LIENS}toplay_file={$T_affich[files]|urlencode}&toplay_rep={$REP|urlencode}" onfocus='aide="Jouer {$T_affich[files]|strip_delimiters|replace:"'":"`"}";'>{$T_affich[files]|strip_delimiters|truncate:52}</a></font>
+
+ </td></tr>
+ {/if}
+{/section}
+
+{if $MIN+$smarty.section.files.total<count($T_affich)}
+ <tr><td colspan="2"><table><tr><td>{suivant} - <font size=2><a href="{$PAGE_EXPLO}?start={$N_affich-$smarty.section.files.total}&directory={$REP|urlencode}&mode={$MODE}">Fin du r\xE9pertoire</a> - Page {$MIN/$NUM_ROW_AFFICH+1|ceil} / {$N_affich/$NUM_ROW_AFFICH|ceil}</font></td>
+{else}
+ <tr><td colspan="2"><table><tr><td><font size=2>Page {$MIN/$NUM_ROW_AFFICH+1|ceil} / {$N_affich/$NUM_ROW_AFFICH|ceil}</font></td>
+{/if}
+
+
+<td width="30" align="center">
+{if $PLAYREP}
+<a href="{$PAGE_LECT_REP}?toplay={$REP|urlencode}&type=playrep" onfocus='aide="Lire le dossier en entier";'><table width="20" height="20" border="0" cellpadding="0" cellspacing="0" bgcolor="{#COULEUR_FOND1#}" abgcolor="{#COULEUR_ALINK#}"><tr height="20"><td align=center width="20" height="20" align="center" valign="middle"><img src="{$SKIN_REP}dossier/rep_all.gif" border="0" width="20" height="20"></td></tr></table></a>
+{/if}
+</td><td width="30" align="center">
+{if $AFF_FAVORIS}
+<a href="{$RACINE_REP}module/favoris/index1.php?ajout={$REP|urlencode}&nom={$REP}" onfocus='aide="Ajouter le dossier aux favoris";'><table width="20" height="20" border="0" cellpadding="0" cellspacing="0" bgcolor="{#COULEUR_FOND1#}" abgcolor="{#COULEUR_ALINK#}"><tr height="20"><td align=center width="20" height="20" align="center" valign="middle"><img src="{$SKIN_REP}dossier/favoris.gif" border="0" width="20" height="20"></td></tr></table></a>
+{/if}
+</td></tr></table>
+</td></tr>
+
+{if $dvdmod}
+<tr><td colspan="2"><a href="index1.php?status=disques">Cliquez ici pour lire un dvd depuis un lecteur optique.</a></td></tr>
+{/if}
+</table>
+{$FOOTER}
Property changes on: trunk/module/_explorateur/explorateur.tpl
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/module/allocine/allocine.tpl
===================================================================
--- trunk/module/allocine/allocine.tpl 2007-05-01 15:16:44 UTC (rev 137)
+++ trunk/module/allocine/allocine.tpl 2007-05-01 15:20:56 UTC (rev 138)
@@ -1,36 +1,36 @@
-{section name=films loop=$FILMS max=3 start=$MIN}
-
- {cycle name=place assign=place print=false values="1,0"}
- {if $smarty.section.films.first}
- {if $MIN==0}
- {$DESCRIPTION}
- {/if}
-
- {if $MIN!=0}
- {assign var=temp value=$MIN-3}
- {attribbouton touche="green" lien="index1.php?start=$temp"}
- <a href="index1.php?&start={$temp}"><img src="{$INTERFACE_REP}btn_vert.gif" border="0"> Pr\xE9c\xE9dent</a>
- {/if}
- <table border="0" cellpadding="2" cellspacing="0" width="500" height="360" align="center"><tr>
- {/if}
- <tr><td width="90" valign="top"><img width="90" height="120" border="0" src="{$IMG2FBX}{$FILMS[films].image|urlencode}&new_width=90&new_height=120&cache=1"></td>
- <td valign=top align=left width="410">
- {if $FILMS[films].video!= ''}
- <a onfocus='front_panel="{$FILMS[films].titre|truncate:12|replace:"'":"`"|replace:"\"":"``"}";' href="playba_allocine.php?url={$FILMS[films].video|urlencode}&from_start={$MIN}">{$FILMS[films].titre|truncate:40} <img src="video.gif" border=0 width=20 height=20></a>
- {else}
- {$FILMS[films].titre|truncate:40}
- {/if}
- <br>
- <font size="1">{$FILMS[films].desc|truncate:400}</font>
- </td>
- </tr>
-{/section}
-</table>
-
-{if $MIN+$smarty.section.films.total<count($FILMS)}
- {assign var=temp value=$MIN+3}
- {attribbouton touche="blue" lien="index1.php?start=$temp"}
- <a href="index1.php?start={$temp}"><img src="{$INTERFACE_REP}btn_bleu.gif" border="0"> Suivant</a>
-
-{/if}
-
+{section name=films loop=$FILMS max=3 start=$MIN}
+
+ {cycle name=place assign=place print=false values="1,0"}
+ {if $smarty.section.films.first}
+ {if $MIN==0}
+ {$DESCRIPTION}
+ {/if}
+
+ {if $MIN!=0}
+ {assign var=temp value=$MIN-3}
+ {attribbouton touche="green" lien="index1.php?start=$temp"}
+ <a href="index1.php?&start={$temp}"><img src="{$INTERFACE_REP}btn_vert.gif" border="0"> Pr\xE9c\xE9dent</a>
+ {/if}
+ <table border="0" cellpadding="2" cellspacing="0" width="500" height="360" align="center"><tr>
+ {/if}
+ <tr><td width="90" valign="top"><img width="90" height="120" border="0" src="{$IMG2FBX}{$FILMS[films].image|urlencode}&new_width=90&new_height=120&cache=1"></td>
+ <td valign=top align=left width="410">
+ {if $FILMS[films].video!= ''}
+ <a onfocus='front_panel="{$FILMS[films].titre|truncate:12|replace:"'":"`"|replace:"\"":"``"}";' href="playba_allocine.php?url={$FILMS[films].video|urlencode}&from_start={$MIN}">{$FILMS[films].titre|truncate:40} <img src="video.gif" border=0 width=20 height=20></a>
+ {else}
+ {$FILMS[films].titre|truncate:40}
+ {/if}
+ <br>
+ <font size="1">{$FILMS[films].desc|truncate:400}</font>
+ </td>
+ </tr>
+{/section}
+</table>
+
+{if $MIN+$smarty.section.films.total<count($FILMS)}
+ {assign var=temp value=$MIN+3}
+ {attribbouton touche="blue" lien="index1.php?start=$temp"}
+ <a href="index1.php?start={$temp}"><img src="{$INTERFACE_REP}btn_bleu.gif" border="0"> Suivant</a>
+
+{/if}
+
Property changes on: trunk/module/allocine/allocine.tpl
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/module/cac40/cac40.tpl
===================================================================
--- trunk/module/cac40/cac40.tpl 2007-05-01 15:16:44 UTC (rev 137)
+++ trunk/module/cac40/cac40.tpl 2007-05-01 15:20:56 UTC (rev 138)
@@ -1,7 +1,7 @@
-<center><img src="{$IMG2FBX}{"http://boursier.fininfo.fr/enhydra/cmbj/servlet/BoursierIntradayServlet?present=boursierivaleur&id1=FR0003500008&dim=470,300&typ1=area"|urlencode}" width="470" height="300"><br>
-A {$heure}, la bourse de Paris est \xE0 {$cours} Pts, en {$variation} de {$pourcentage}<br>
-<table width="450" cellpadding="2" cellspacing="0"><tr>
-<td width=25%>Clot. pr\xE9c. :</td><td width=25%>{$cloture_precedente} Pts</td><td width=25%>Ouverture :</td><td width=25%>{$ouverture} Pts</td></tr><tr>
-<td colspan="2">Variation journali\xE8re :</td><td colspan="2">{$var_jour} Pts</td></tr><tr>
-<td colspan="2">Variation annuelle :</td><td colspan="2">{$var_annee} Pts</td>
-</tr></table></center>
+<center><img src="{$IMG2FBX}{"http://boursier.fininfo.fr/enhydra/cmbj/servlet/BoursierIntradayServlet?present=boursierivaleur&id1=FR0003500008&dim=470,300&typ1=area"|urlencode}" width="470" height="300"><br>
+A {$heure}, la bourse de Paris est \xE0 {$cours} Pts, en {$variation} de {$pourcentage}<br>
+<table width="450" cellpadding="2" cellspacing="0"><tr>
+<td width=25%>Clot. pr\xE9c. :</td><td width=25%>{$cloture_precedente} Pts</td><td width=25%>Ouverture :</td><td width=25%>{$ouverture} Pts</td></tr><tr>
+<td colspan="2">Variation journali\xE8re :</td><td colspan="2">{$var_jour} Pts</td></tr><tr>
+<td colspan="2">Variation annuelle :</td><td colspan="2">{$var_annee} Pts</td>
+</tr></table></center>
Property changes on: trunk/module/cac40/cac40.tpl
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/module/cinefil/sorties_cine.tpl
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/module/clips/clips.tpl
===================================================================
--- trunk/module/clips/clips.tpl 2007-05-01 15:16:44 UTC (rev 137)
+++ trunk/module/clips/clips.tpl 2007-05-01 15:20:56 UTC (rev 138)
@@ -1,76 +1,76 @@
-{if $SHOW!='rec'}
- {assign var=NUM_ROW_AFFICH value=10}
- {section name=clip loop=$CLIP max=$NUM_ROW_AFFICH start=$START}
- {cycle name=place assign=place print=false values="4,3,2,1,0"}
- {if $smarty.section.clip.first}
- <table border="0" cellpadding="0" cellspacing="0" width="500" align="center"><tr>
- {if $MIN!=0}
- <td colspan="5" align=center>{precedent}</td></tr><tr>
- {/if}
- {/if}
-
- <td width="100" height="150"><a href="play_clip.php?clipid={$CLIP[clip].id}&show={$SHOW}&min={$MIN}{if $SHOW=='tous'}&lettre={$LETTRE}{/if}"><table border="0" cellpadding="0" cellspacing="0" width="100" height="120" bgcolor="{#COULEUR_FOND1#}" abgcolor="{#COULEUR_TABLE_SELECTED#}"><tr height="80"><td width="100" height="80" valign="middle" align="center"><img width="80" height="80" border="0" src="{$IMG2FBX}{$CLIP[clip].img|urlencode}&new_width=80&new_height=80&cache=1"></td></tr><tr height="70"><td width="100" height="70" valign="middle" align=center><font size="1">{$CLIP[clip].chanteur|wordwrap:18:"<br>":true}<br>{$CLIP[clip].titre|wordwrap:18:"<br>":true}</font></td></tr></table></a></td>
-
- {if $smarty.section.clip.iteration is div by 5 AND NOT $smarty.section.files.last}
- </tr><tr>
- {/if}
-
- {if $smarty.section.clip.last}
- {if $place >= 4}
- <td> </td>
- {/if}
- {if $place >= 3}
- <td> </td>
- {/if}
- {if $place >= 2}
- <td> </td>
- {/if}
- {if $place >= 1}
- <td> </td>
- {/if}
- </tr>
- <tr><td colspan="5" align="center" height="25" valign="bottom">{if $MIN+$NUM_ROW_AFFICH < $TOTAL}{suivant} - {/if}{$DEB+$START} \xE0 {$FIN-10+$START} sur {$TOTAL}</td></tr>
- </table>
-
- {if $SHOW=='tous'}
- <TABLE cellspacing=0 cellpading=0>
- <TR>
- <TD align="center" width="30"><font size="1"><A hRef="index1.php?show=tous&lettre=0"><B>0-9</B></A></FONT></TD>
- {section name=lettres loop=$lettres}
- {if $smarty.section.lettres.iteration==14}
- </TR><TR>
- {/if}
- <TD align="center" width="26"><font size="1"><A hRef="index1.php?show=tous&lettre={$lettres[lettres].0}"><B>{$lettres[lettres].1}</B></A></FONT></TD>
- {if $smarty.section.lettres.last}
- <TD align="center" width="30"> </TD>
- {/if}
- {/section}
- </TR>
- </TABLE>
- {/if}
- {/if}
-
- {/section}
-{else}
-
-{section name=clip loop=$CLIP max=20 start=0}
- {if $smarty.section.clip.first}
- <table border="0" cellpadding="0" cellspacing="0" width="400" align="center">
- {/if}
- {cycle name=color assign=COLOR print=false values="`$smarty.config.COULEUR_INTERFACE1`,`$smarty.config.COULEUR_INTERFACE2`"}
-
- <tr><td width="400" bgcolor="{$COLOR}"><a href="play_clip.php?clipid={$CLIP[clip].id}&show=rec&string={$string}"><table width="400" border="0" cellpadding="0" cellspacing="0" bgcolor="{$COLOR}" abgcolor="{#COULEUR_ALINK#}"><tr><td width="400">{$CLIP[clip].chanteur} - {$CLIP[clip].titre}</td></tr></table></a></td></tr>
-
- {if $smarty.section.clip.last}
- </table>
- {/if}
-{sectionelse}
- {if $string!=''}Aucun clip trouv\xE9 pour la requ\xEAte : "{$string}".{else}Veuillez entrer votre recherche ci-dessous.{/if}
-{/section}
-
-<br>Recherche<br> <br><form name="form1" method="get" action="index1.php">
-<input name="show" type="hidden" value="rec">
-<input name="string" bgcolor="{#COULEUR_TEXTBOX#}" type="text" charset="digit|alpha|caps" value="" size="20">
-</form><br>
-La touche {literal}#{/literal} permet de changer entre les minuscules/majuscules et les chiffres.
-{/if}
+{if $SHOW!='rec'}
+ {assign var=NUM_ROW_AFFICH value=10}
+ {section name=clip loop=$CLIP max=$NUM_ROW_AFFICH start=$START}
+ {cycle name=place assign=place print=false values="4,3,2,1,0"}
+ {if $smarty.section.clip.first}
+ <table border="0" cellpadding="0" cellspacing="0" width="500" align="center"><tr>
+ {if $MIN!=0}
+ <td colspan="5" align=center>{precedent}</td></tr><tr>
+ {/if}
+ {/if}
+
+ <td width="100" height="150"><a href="play_clip.php?clipid={$CLIP[clip].id}&show={$SHOW}&min={$MIN}{if $SHOW=='tous'}&lettre={$LETTRE}{/if}"><table border="0" cellpadding="0" cellspacing="0" width="100" height="120" bgcolor="{#COULEUR_FOND1#}" abgcolor="{#COULEUR_TABLE_SELECTED#}"><tr height="80"><td width="100" height="80" valign="middle" align="center"><img width="80" height="80" border="0" src="{$IMG2FBX}{$CLIP[clip].img|urlencode}&new_width=80&new_height=80&cache=1"></td></tr><tr height="70"><td width="100" height="70" valign="middle" align=center><font size="1">{$CLIP[clip].chanteur|wordwrap:18:"<br>":true}<br>{$CLIP[clip].titre|wordwrap:18:"<br>":true}</font></td></tr></table></a></td>
+
+ {if $smarty.section.clip.iteration is div by 5 AND NOT $smarty.section.files.last}
+ </tr><tr>
+ {/if}
+
+ {if $smarty.section.clip.last}
+ {if $place >= 4}
+ <td> </td>
+ {/if}
+ {if $place >= 3}
+ <td> </td>
+ {/if}
+ {if $place >= 2}
+ <td> </td>
+ {/if}
+ {if $place >= 1}
+ <td> </td>
+ {/if}
+ </tr>
+ <tr><td colspan="5" align="center" height="25" valign="bottom">{if $MIN+$NUM_ROW_AFFICH < $TOTAL}{suivant} - {/if}{$DEB+$START} \xE0 {$FIN-10+$START} sur {$TOTAL}</td></tr>
+ </table>
+
+ {if $SHOW=='tous'}
+ <TABLE cellspacing=0 cellpading=0>
+ <TR>
+ <TD align="center" width="30"><font size="1"><A hRef="index1.php?show=tous&lettre=0"><B>0-9</B></A></FONT></TD>
+ {section name=lettres loop=$lettres}
+ {if $smarty.section.lettres.iteration==14}
+ </TR><TR>
+ {/if}
+ <TD align="center" width="26"><font size="1"><A hRef="index1.php?show=tous&lettre={$lettres[lettres].0}"><B>{$lettres[lettres].1}</B></A></FONT></TD>
+ {if $smarty.section.lettres.last}
+ <TD align="center" width="30"> </TD>
+ {/if}
+ {/section}
+ </TR>
+ </TABLE>
+ {/if}
+ {/if}
+
+ {/section}
+{else}
+
+{section name=clip loop=$CLIP max=20 start=0}
+ {if $smarty.section.clip.first}
+ <table border="0" cellpadding="0" cellspacing="0" width="400" align="center">
+ {/if}
+ {cycle name=color assign=COLOR print=false values="`$smarty.config.COULEUR_INTERFACE1`,`$smarty.config.COULEUR_INTERFACE2`"}
+
+ <tr><td width="400" bgcolor="{$COLOR}"><a href="play_clip.php?clipid={$CLIP[clip].id}&show=rec&string={$string}"><table width="400" border="0" cellpadding="0" cellspacing="0" bgcolor="{$COLOR}" abgcolor="{#COULEUR_ALINK#}"><tr><td width="400">{$CLIP[clip].chanteur} - {$CLIP[clip].titre}</td></tr></table></a></td></tr>
+
+ {if $smarty.section.clip.last}
+ </table>
+ {/if}
+{sectionelse}
+ {if $string!=''}Aucun clip trouv\xE9 pour la requ\xEAte : "{$string}".{else}Veuillez entrer votre recherche ci-dessous.{/if}
+{/section}
+
+<br>Recherche<br> <br><form name="form1" method="get" action="index1.php">
+<input name="show" type="hidden" value="rec">
+<input name="string" bgcolor="{#COULEUR_TEXTBOX#}" type="text" charset="digit|alpha|caps" value="" size="20">
+</form><br>
+La touche {literal}#{/literal} permet de changer entre les minuscules/majuscules et les chiffres.
+{/if}
Property changes on: trunk/module/clips/clips.tpl
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/module/dailymotion/dailymotion.tpl
===================================================================
--- trunk/module/dailymotion/dailymotion.tpl 2007-05-01 15:16:44 UTC (rev 137)
+++ trunk/module/dailymotion/dailymotion.tpl 2007-05-01 15:20:56 UTC (rev 138)
@@ -1,38 +1,38 @@
-{assign var=NUM_ROW_AFFICH value=10}
-{section name=clip loop=$CLIP max=$NUM_ROW_AFFICH start=0}
-{cycle name=place assign=place print=false values="4,3,2,1,0"}
- {if $smarty.section.clip.first}
- <table border="0" cellpadding="0" cellspacing="0" width="500" align="center"><tr>
- {if $MIN!=0}
- <td colspan="5" align=center>{precedent}</td></tr><tr>
- {/if}
- {/if}
-
- <td width="100" height="150"><a href="play_dailymotion.php?url={$CLIP[clip].url|urlencode}&show={$SHOW}&min={$MIN}&string={$string}"><table border="0" cellpadding="0" cellspacing="0" width="100" height="120" bgcolor="{#COULEUR_FOND1#}" abgcolor="{#COULEUR_TABLE_SELECTED#}"><tr height="80"><td width="100" height="80" valign="middle" align="center"><img width="80" height="60" border="0" src="{$IMG2FBX}{$CLIP[clip].img|urlencode}&new_width=80&new_height=60&cache=1"></td></tr><tr height="70"><td width="100" height="70" valign="middle" align=center><font size="1">{$CLIP[clip].titre|truncate:30:"":true|wordwrap:15:"<br>":true} ({$CLIP[clip].temps})</font></td></tr></table></a></td>
-
- {if $smarty.section.clip.iteration is div by 5 AND NOT $smarty.section.files.last}
- </tr><tr>
- {/if}
-
- {if $smarty.section.clip.last}
- {if $place >= 4}<td> </td>{/if}
- {if $place >= 3}<td> </td>{/if}
- {if $place >= 2}<td> </td>{/if}
- {if $place >= 1}<td> </td>{/if}
- </tr>
- <tr><td colspan="5" align="center" height="25" valign="bottom">{if $MIN+$NUM_ROW_AFFICH < $TOTAL}{suivant} - {/if}{$DEB} \xE0 {$FIN}</td></tr>
- </table>
- {/if}
-{sectionelse}
- {if $SHOW=='rec'}
- {if $string!=''}Aucune vid\xE9o trouv\xE9e pour la requ\xEAte : "{$string}".{else}Veuillez entrer votre recherche ci-dessous.{/if}
- {/if}
-{/section}
-
-{if $SHOW=='rec'}
-<br>Recherche<br> <br><form name="form1" method="get" action="index1.php">
-<input name="show" type="hidden" value="rec">
-<input name="string" bgcolor="{#COULEUR_TEXTBOX#}" type="text" charset="digit|alpha|caps" value="" size="20">
-</form><br>
-La touche {literal}#{/literal} permet de changer entre les minuscules/majuscules et les chiffres.
-{/if}
+{assign var=NUM_ROW_AFFICH value=10}
+{section name=clip loop=$CLIP max=$NUM_ROW_AFFICH start=0}
+{cycle name=place assign=place print=false values="4,3,2,1,0"}
+ {if $smarty.section.clip.first}
+ <table border="0" cellpadding="0" cellspacing="0" width="500" align="center"><tr>
+ {if $MIN!=0}
+ <td colspan="5" align=center>{precedent}</td></tr><tr>
+ {/if}
+ {/if}
+
+ <td width="100" height="150"><a href="play_dailymotion.php?url={$CLIP[clip].url|urlencode}&show={$SHOW}&min={$MIN}&string={$string}"><table border="0" cellpadding="0" cellspacing="0" width="100" height="120" bgcolor="{#COULEUR_FOND1#}" abgcolor="{#COULEUR_TABLE_SELECTED#}"><tr height="80"><td width="100" height="80" valign="middle" align="center"><img width="80" height="60" border="0" src="{$IMG2FBX}{$CLIP[clip].img|urlencode}&new_width=80&new_height=60&cache=1"></td></tr><tr height="70"><td width="100" height="70" valign="middle" align=center><font size="1">{$CLIP[clip].titre|truncate:30:"":true|wordwrap:15:"<br>":true} ({$CLIP[clip].temps})</font></td></tr></table></a></td>
+
+ {if $smarty.section.clip.iteration is div by 5 AND NOT $smarty.section.files.last}
+ </tr><tr>
+ {/if}
+
+ {if $smarty.section.clip.last}
+ {if $place >= 4}<td> </td>{/if}
+ {if $place >= 3}<td> </td>{/if}
+ {if $place >= 2}<td> </td>{/if}
+ {if $place >= 1}<td> </td>{/if}
+ </tr>
+ <tr><td colspan="5" align="center" height="25" valign="bottom">{if $MIN+$NUM_ROW_AFFICH < $TOTAL}{suivant} - {/if}{$DEB} \xE0 {$FIN}</td></tr>
+ </table>
+ {/if}
+{sectionelse}
+ {if $SHOW=='rec'}
+ {if $string!=''}Aucune vid\xE9o trouv\xE9e pour la requ\xEAte : "{$string}".{else}Veuillez entrer votre recherche ci-dessous.{/if}
+ {/if}
+{/section}
+
+{if $SHOW=='rec'}
+<br>Recherche<br> <br><form name="form1" method="get" action="index1.php">
+<input name="show" type="hidden" value="rec">
+<input name="string" bgcolor="{#COULEUR_TEXTBOX#}" type="text" charset="digit|alpha|caps" value="" size="20">
+</form><br>
+La touche {literal}#{/literal} permet de changer entre les minuscules/majuscules et les chiffres.
+{/if}
Property changes on: trunk/module/dailymotion/dailymotion.tpl
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/module/diaporama/explorateur_photo.tpl
===================================================================
--- trunk/module/diaporama/explorateur_photo.tpl 2007-05-01 15:16:44 UTC (rev 137)
+++ trunk/module/diaporama/explorateur_photo.tpl 2007-05-01 15:20:56 UTC (rev 138)
@@ -1,77 +1,77 @@
-{assign var=NUM_ROW_AFFICH value=15}
-{assign var=rep_encoded value=$REP|urlencode}
-
-<center>
-{assign var=prev_dir value=$REP|dirname|realpath|urlencode}
-{if $Nb_rep_path >='2'}
-<img src="{$INTERFACE_REP}btn_jaune.gif" border="0"> <a focused href="index1.php?rep={$prev_dir}">Dossier parent</a> -
-{attribbouton touche="yellow" lien="index1.php?rep=$prev_dir"}
-{elseif $Nb_rep_path =='1'}
-<img src="{$INTERFACE_REP}btn_jaune.gif" border="0"> <a focused href="index1.php?dos=disks">Dossier parent</a> -
-{attribbouton touche="yellow" lien="index1.php?dos=disks"}
-{/if}
-
-{section name=path loop=$CHEMIN_REP start=count($CHEMIN_REP)-2}
- {if $smarty.section.path.first}
- <font size="1">
- {/if}
- <a href="{$PAGE_EXPLO}?directory={$CHEMIN_REP[path].0}&mode={$MODE}">{$CHEMIN_REP[path].1|strip_delimiters}/</a>
- {if $smarty.section.path.last}
- </font>
- {/if}
-{/section}
-</center>
-
- {section name=files loop=$files max=$NUM_ROW_AFFICH start=$MIN}
- {cycle name=place assign=place print=false values="4,3,2,1,0"}
- {if $smarty.section.files.first}
- <table border="0" cellpadding="0" cellspacing="0" width="500" height="436" align="center"><tr>
- {if $MIN!=0}
- {assign var=temp value=$MIN-$NUM_ROW_AFFICH}
- {attribbouton touche="green" lien="index1.php?start=$temp&rep=$rep_encoded"}
- <td colspan="5" align=center><img src="{$INTERFACE_REP}btn_vert.gif" border="0"> <a href="index1.php?start={$temp}&rep={$rep_encoded}">Pr\xE9c\xE9dent</a> <a href="index1.php?start=0&rep={$rep_encoded}">D\xE9but</a></td></tr><tr>
- {/if}
- {/if}
-
- {if $files[files]|in_array:$T_repertoire}
- {if $DOS}
- <td width="100" height="130"><a href="index1.php?rep={$files[files].path|urlencode}" onfocus='aide="{$files[files]|strip_delimiters|replace:"'":"`"}";'><table border="0" cellpadding="0" cellspacing="0" width="100" height="120" bgcolor="{#COULEUR_FOND1#}" abgcolor="{#COULEUR_TABLE_SELECTED#}"><tr height="80"><td width="100" height="80" valign="middle" align="center"><img border=0 width="64" height="64" src="lecteur.gif"></td></tr><tr height="50"><td width="100" height="50" valign="middle" align=center><font size="1">{$files[files].nom} ({$files[files].lettre|strtolower}:)</font></td></tr></table></a></td>
- {else}
- <td width="100" height="130"><a href="index1.php?rep={$REP|cat:'/'|cat:$files[files]|urlencode}" onfocus='aide="{$files[files]|strip_delimiters|replace:"'":"`"}";'><table border="0" cellpadding="0" cellspacing="0" width="100" height="120" bgcolor="{#COULEUR_FOND1#}" abgcolor="{#COULEUR_TABLE_SELECTED#}"><tr height="80"><td width="100" height="80" valign="middle" align="center"><img border=0 width="64" height="64" src="big_dossier.gif"></td></tr><tr height="50"><td width="100" height="50" valign="middle" align=center><font size="1">{$files[files]|truncate:20:"":true|wordwrap:10:"<br>":true|strip_delimiters}</font></td></tr></table></a></td>
- {/if}
- {else}
- {assign var="dim" value=$REP|cat:'/'|cat:$files[files]|getimagesize}
- {assign var="newdim" value=$dim.0|get_size:$dim.1}
-
- <td width="100" height="130" valign="middle" align="center"><a href="index1.php?image={$smarty.section.files.index}&rep={$rep_encoded}&start={$MIN}" onfocus='aide="{$files[files]|strip_delimiters|replace:"'":"`"}";'><table border="0" cellpadding="0" cellspacing="0" width="100" height="120" bgcolor="{#COULEUR_FOND1#}" abgcolor="{#COULEUR_TABLE_SELECTED#}"><tr height="80"><td width="100" height="80" valign="middle" align="center" background="fond_cell.gif"><img width="{$newdim.0}" height="{$newdim.1}" border="0" src="{$RACINE_REP}_framework/lib/img_cr.php?local=1&formatw=88&formath=68&img={$REP|cat:'/'|cat:$files[files]|urlencode}"></td></tr><tr height="50"><td width="100" height="50" valign="middle" align=center><font size="1">{$files[files]|truncate:20:"":true|wordwrap:10:"<br>":true|strip_delimiters}</font></td></tr></table></a></td>
- {/if}
-
-
- {if $smarty.section.files.iteration is div by 5 AND NOT $smarty.section.files.last}
- </tr><tr>
- {/if}
-
- {if $smarty.section.files.last}
- {if $place >= 4}
- <td> </td>
- {/if}
- {if $place >= 3}
- <td> </td>
- {/if}
- {if $place >= 2}
- <td> </td>
- {/if}
- {if $place >= 1}
- <td> </td>
- {/if}
- </tr>
- {if $MIN+$NUM_ROW_AFFICH < $rows}
- {assign var=temp value=$MIN+$NUM_ROW_AFFICH}
- {attribbouton touche="blue" lien="index1.php?start=$temp&rep=$rep_encoded"}
- <tr><td colspan="5" align=center height=25 valign=bottom><img src="{$INTERFACE_REP}btn_bleu.gif" border="0"> <a href="index1.php?start={$temp}&rep={$rep_encoded}">Suivant</a> <a href="index1.php?start={$rows-$NUM_ROW_AFFICH}&rep={$rep_encoded}">Fin</a></td></tr>
- {/if}
-
- </table>
- {/if}
-
- {/section}
+{assign var=NUM_ROW_AFFICH value=15}
+{assign var=rep_encoded value=$REP|urlencode}
+
+<center>
+{assign var=prev_dir value=$REP|dirname|realpath|urlencode}
+{if $Nb_rep_path >='2'}
+<img src="{$INTERFACE_REP}btn_jaune.gif" border="0"> <a focused href="index1.php?rep={$prev_dir}">Dossier parent</a> -
+{attribbouton touche="yellow" lien="index1.php?rep=$prev_dir"}
+{elseif $Nb_rep_path =='1'}
+<img src="{$INTERFACE_REP}btn_jaune.gif" border="0"> <a focused href="index1.php?dos=disks">Dossier parent</a> -
+{attribbouton touche="yellow" lien="index1.php?dos=disks"}
+{/if}
+
+{section name=path loop=$CHEMIN_REP start=count($CHEMIN_REP)-2}
+ {if $smarty.section.path.first}
+ <font size="1">
+ {/if}
+ <a href="{$PAGE_EXPLO}?directory={$CHEMIN_REP[path].0}&mode={$MODE}">{$CHEMIN_REP[path].1|strip_delimiters}/</a>
+ {if $smarty.section.path.last}
+ </font>
+ {/if}
+{/section}
+</center>
+
+ {section name=files loop=$files max=$NUM_ROW_AFFICH start=$MIN}
+ {cycle name=place assign=place print=false values="4,3,2,1,0"}
+ {if $smarty.section.files.first}
+ <table border="0" cellpadding="0" cellspacing="0" width="500" height="436" align="center"><tr>
+ {if $MIN!=0}
+ {assign var=temp value=$MIN-$NUM_ROW_AFFICH}
+ {attribbouton touche="green" lien="index1.php?start=$temp&rep=$rep_encoded"}
+ <td colspan="5" align=center><img src="{$INTERFACE_REP}btn_vert.gif" border="0"> <a href="index1.php?start={$temp}&rep={$rep_encoded}">Pr\xE9c\xE9dent</a> <a href="index1.php?start=0&rep={$rep_encoded}">D\xE9but</a></td></tr><tr>
+ {/if}
+ {/if}
+
+ {if $files[files]|in_array:$T_repertoire}
+ {if $DOS}
+ <td width="100" height="130"><a href="index1.php?rep={$files[files].path|urlencode}" onfocus='aide="{$files[files]|strip_delimiters|replace:"'":"`"}";'><table border="0" cellpadding="0" cellspacing="0" width="100" height="120" bgcolor="{#COULEUR_FOND1#}" abgcolor="{#COULEUR_TABLE_SELECTED#}"><tr height="80"><td width="100" height="80" valign="middle" align="center"><img border=0 width="64" height="64" src="lecteur.gif"></td></tr><tr height="50"><td width="100" height="50" valign="middle" align=center><font size="1">{$files[files].nom} ({$files[files].lettre|strtolower}:)</font></td></tr></table></a></td>
+ {else}
+ <td width="100" height="130"><a href="index1.php?rep={$REP|cat:'/'|cat:$files[files]|urlencode}" onfocus='aide="{$files[files]|strip_delimiters|replace:"'":"`"}";'><table border="0" cellpadding="0" cellspacing="0" width="100" height="120" bgcolor="{#COULEUR_FOND1#}" abgcolor="{#COULEUR_TABLE_SELECTED#}"><tr height="80"><td width="100" height="80" valign="middle" align="center"><img border=0 width="64" height="64" src="big_dossier.gif"></td></tr><tr height="50"><td width="100" height="50" valign="middle" align=center><font size="1">{$files[files]|truncate:20:"":true|wordwrap:10:"<br>":true|strip_delimiters}</font></td></tr></table></a></td>
+ {/if}
+ {else}
+ {assign var="dim" value=$REP|cat:'/'|cat:$files[files]|getimagesize}
+ {assign var="newdim" value=$dim.0|get_size:$dim.1}
+
+ <td width="100" height="130" valign="middle" align="center"><a href="index1.php?image={$smarty.section.files.index}&rep={$rep_encoded}&start={$MIN}" onfocus='aide="{$files[files]|strip_delimiters|replace:"'":"`"}";'><table border="0" cellpadding="0" cellspacing="0" width="100" height="120" bgcolor="{#COULEUR_FOND1#}" abgcolor="{#COULEUR_TABLE_SELECTED#}"><tr height="80"><td width="100" height="80" valign="middle" align="center" background="fond_cell.gif"><img width="{$newdim.0}" height="{$newdim.1}" border="0" src="{$RACINE_REP}_framework/lib/img_cr.php?local=1&formatw=88&formath=68&img={$REP|cat:'/'|cat:$files[files]|urlencode}"></td></tr><tr height="50"><td width="100" height="50" valign="middle" align=center><font size="1">{$files[files]|truncate:20:"":true|wordwrap:10:"<br>":true|strip_delimiters}</font></td></tr></table></a></td>
+ {/if}
+
+
+ {if $smarty.section.files.iteration is div by 5 AND NOT $smarty.section.files.last}
+ </tr><tr>
+ {/if}
+
+ {if $smarty.section.files.last}
+ {if $place >= 4}
+ <td> </td>
+ {/if}
+ {if $place >= 3}
+ <td> </td>
+ {/if}
+ {if $place >= 2}
+ <td> </td>
+ {/if}
+ {if $place >= 1}
+ <td> </td>
+ {/if}
+ </tr>
+ {if $MIN+$NUM_ROW_AFFICH < $rows}
+ {assign var=temp value=$MIN+$NUM_ROW_AFFICH}
+ {attribbouton touche="blue" lien="index1.php?start=$temp&rep=$rep_encoded"}
+ <tr><td colspan="5" align=center height=25 valign=bottom><img src="{$INTERFACE_REP}btn_bleu.gif" border="0"> <a href="index1.php?start={$temp}&rep={$rep_encoded}">Suivant</a> <a href="index1.php?start={$rows-$NUM_ROW_AFFICH}&rep={$rep_encoded}">Fin</a></td></tr>
+ {/if}
+
+ </table>
+ {/if}
+
+ {/section}
Property changes on: trunk/module/diaporama/explorateur_photo.tpl
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/module/diaporama/photo.tpl
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/module/dvd/dvd.tpl
===================================================================
--- trunk/module/dvd/dvd.tpl 2007-05-01 15:16:44 UTC (rev 137)
+++ trunk/module/dvd/dvd.tpl 2007-05-01 15:20:56 UTC (rev 138)
@@ -1,40 +1,40 @@
-{section name=dop loop=$disques_optique}
-{cycle name=place assign=place print=false values="4,3,2,1,0"}
- {if $smarty.section.dop.first}
- <table border="0" cellpadding="0" cellspacing="0" width="500" align="center"><tr>
- {/if}
- <td width="100" height="130"><a href="playrep.php?toplay={$disques_optique[dop].path|urlencode}&type=playrep"><table border="0" cellpadding="0" cellspacing="0" width="100" height="120" bgcolor="{#COULEUR_FOND1#}" abgcolor="{#COULEUR_TABLE_SELECTED#}"><tr height="80"><td width="100" height="80" valign="middle" align="center"><img border=0 width="64" height="64" src="lecteurdvd.gif"></td></tr><tr height="50"><td width="100" height="50" valign="middle" align=center><font size="1">{$disques_optique[dop].nom} ({$disques_optique[dop].lettre}:)</font></td></tr></table></a></td>
-
- {if $smarty.section.dop.iteration is div by 5 AND NOT $smarty.section.dop.last}
- </tr><tr>
- {/if}
-
- {if $smarty.section.dop.last}
- {if $place >= 4}
- <td> </td>
- {/if}
- {if $place >= 3}
- <td> </td>
- {/if}
- {if $place >= 2}
- <td> </td>
- {/if}
- {if $place >= 1}
- <td> </td>
- {/if}
- </tr>
-
- </table>
- <br>
- <a href="index1.php?status=explorateur">Cliquez ici pour lire des dvd ripp\xE9s ou au format image depuis l'explorateur.</a>
-
- {/if}
-{sectionelse}
-
-Aucun lecteur DVD physique n'est disponible.
-<br>
-<br>
-<br>
-<a href="index1.php?status=explorateur">Cliquez ici pour lire des dvd ripp\xE9s ou au format image depuis l'explorateur.</a>
-
-{/section}
+{section name=dop loop=$disques_optique}
+{cycle name=place assign=place print=false values="4,3,2,1,0"}
+ {if $smarty.section.dop.first}
+ <table border="0" cellpadding="0" cellspacing="0" width="500" align="center"><tr>
+ {/if}
+ <td width="100" height="130"><a href="playrep.php?toplay={$disques_optique[dop].path|urlencode}&type=playrep"><table border="0" cellpadding="0" cellspacing="0" width="100" height="120" bgcolor="{#COULEUR_FOND1#}" abgcolor="{#COULEUR_TABLE_SELECTED#}"><tr height="80"><td width="100" height="80" valign="middle" align="center"><img border=0 width="64" height="64" src="lecteurdvd.gif"></td></tr><tr height="50"><td width="100" height="50" valign="middle" align=center><font size="1">{$disques_optique[dop].nom} ({$disques_optique[dop].lettre}:)</font></td></tr></table></a></td>
+
+ {if $smarty.section.dop.iteration is div by 5 AND NOT $smarty.section.dop.last}
+ </tr><tr>
+ {/if}
+
+ {if $smarty.section.dop.last}
+ {if $place >= 4}
+ <td> </td>
+ {/if}
+ {if $place >= 3}
+ <td> </td>
+ {/if}
+ {if $place >= 2}
+ <td> </td>
+ {/if}
+ {if $place >= 1}
+ <td> </td>
+ {/if}
+ </tr>
+
+ </table>
+ <br>
+ <a href="index1.php?status=explorateur">Cliquez ici pour lire des dvd ripp\xE9s ou au format image depuis l'explorateur.</a>
+
+ {/if}
+{sectionelse}
+
+Aucun lecteur DVD physique n'est disponible.
+<br>
+<br>
+<br>
+<a href="index1.php?status=explorateur">Cliquez ici pour lire des dvd ripp\xE9s ou au format image depuis l'explorateur.</a>
+
+{/section}
Property changes on: trunk/module/dvd/dvd.tpl
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/module/dvd/menu_dvd.tpl
===================================================================
--- trunk/module/dvd/menu_dvd.tpl 2007-05-01 15:16:44 UTC (rev 137)
+++ trunk/module/dvd/menu_dvd.tpl 2007-05-01 15:20:56 UTC (rev 138)
@@ -1,20 +1,20 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
-<html>
-<head>
-{include file="bouton.tpl"}
-{setbackground path="none"}
-</head>
-<body background="ts://127.0.0.1" text="{#COULEUR_TEXT#}" link="{#COULEUR_LINK#}" alink="{#COULEUR_ALINK#}" vlink="{#COULEUR_VLINK#}">
-<center>
-<table border="0" cellpadding="0" cellspacing="0" valign=top><tr>
-<td bgcolor="{#COULEUR_FOND2#}" align=center valign=top>
-<font size="4"><u>{$titre}</u></font><br> <br>
- <table border="0" align="center" cellpadding="0" cellspacing="0"><tr><td align="center"><br>
- {$affich}
- </td></tr></table>
-</td></tr></table>
-</center>
-<script language="javascript" src="/fb2ie.js">
-</script>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
+<html>
+<head>
+{include file="bouton.tpl"}
+{setbackground path="none"}
+</head>
+<body background="ts://127.0.0.1" text="{#COULEUR_TEXT#}" link="{#COULEUR_LINK#}" alink="{#COULEUR_ALINK#}" vlink="{#COULEUR_VLINK#}">
+<center>
+<table border="0" cellpadding="0" cellspacing="0" valign=top><tr>
+<td bgcolor="{#COULEUR_FOND2#}" align=center valign=top>
+<font size="4"><u>{$titre}</u></font><br> <br>
+ <table border="0" align="center" cellpadding="0" cellspacing="0"><tr><td align="center"><br>
+ {$affich}
+ </td></tr></table>
+</td></tr></table>
+</center>
+<script language="javascript" src="/fb2ie.js">
+</script>
+</body>
+</html>
Property changes on: trunk/module/dvd/menu_dvd.tpl
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/module/ephemeride/ephemeride.tpl
===================================================================
--- trunk/module/ephemeride/ephemeride.tpl 2007-05-01 15:16:44 UTC (rev 137)
+++ trunk/module/ephemeride/ephemeride.tpl 2007-05-01 15:20:56 UTC (rev 138)
@@ -1,12 +1,12 @@
-<cente...
[truncated message content] |
|
From: <gu...@us...> - 2007-05-01 15:16:49
|
Revision: 137
http://svn.sourceforge.net/easybox-mod/?rev=137&view=rev
Author: guyou
Date: 2007-05-01 08:16:44 -0700 (Tue, 01 May 2007)
Log Message:
-----------
Ajout svn:eol-style=native sur fichiers .txt (#1699723)
Modified Paths:
--------------
trunk/_utilisateur/site_html.txt
Property Changed:
----------------
trunk/_utilisateur/site_html.txt
trunk/module/guidetv/listechainetelepoche.txt
trunk/module/pendu/mots.txt
Modified: trunk/_utilisateur/site_html.txt
===================================================================
--- trunk/_utilisateur/site_html.txt 2007-05-01 10:45:52 UTC (rev 136)
+++ trunk/_utilisateur/site_html.txt 2007-05-01 15:16:44 UTC (rev 137)
@@ -1,5 +1,5 @@
-Annuaire
-
-surf on mobile|http://www.surfsurmobile.com/
-
-Annuaire Freeplayer.org|http://www.freeplayer.org/freebox/
+Annuaire
+
+surf on mobile|http://www.surfsurmobile.com/
+
+Annuaire Freeplayer.org|http://www.freeplayer.org/freebox/
Property changes on: trunk/_utilisateur/site_html.txt
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/module/guidetv/listechainetelepoche.txt
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/module/pendu/mots.txt
___________________________________________________________________
Name: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ara...@us...> - 2007-05-01 10:45:57
|
Revision: 136
http://svn.sourceforge.net/easybox-mod/?rev=136&view=rev
Author: aragornis
Date: 2007-05-01 03:45:52 -0700 (Tue, 01 May 2007)
Log Message:
-----------
L?\195?\160 c'est bon ;)
Added Paths:
-----------
trunk/module/allocine/
trunk/module/allocine/allocine.tpl
trunk/module/allocine/cache/
trunk/module/allocine/icone.gif
trunk/module/allocine/index1.php
trunk/module/allocine/jf_extralib.php
trunk/module/allocine/playba_allocine.php
trunk/module/allocine/video.gif
Added: trunk/module/allocine/allocine.tpl
===================================================================
--- trunk/module/allocine/allocine.tpl (rev 0)
+++ trunk/module/allocine/allocine.tpl 2007-05-01 10:45:52 UTC (rev 136)
@@ -0,0 +1,36 @@
+{section name=films loop=$FILMS max=3 start=$MIN}
+
+ {cycle name=place assign=place print=false values="1,0"}
+ {if $smarty.section.films.first}
+ {if $MIN==0}
+ {$DESCRIPTION}
+ {/if}
+
+ {if $MIN!=0}
+ {assign var=temp value=$MIN-3}
+ {attribbouton touche="green" lien="index1.php?start=$temp"}
+ <a href="index1.php?&start={$temp}"><img src="{$INTERFACE_REP}btn_vert.gif" border="0"> Pr\xE9c\xE9dent</a>
+ {/if}
+ <table border="0" cellpadding="2" cellspacing="0" width="500" height="360" align="center"><tr>
+ {/if}
+ <tr><td width="90" valign="top"><img width="90" height="120" border="0" src="{$IMG2FBX}{$FILMS[films].image|urlencode}&new_width=90&new_height=120&cache=1"></td>
+ <td valign=top align=left width="410">
+ {if $FILMS[films].video!= ''}
+ <a onfocus='front_panel="{$FILMS[films].titre|truncate:12|replace:"'":"`"|replace:"\"":"``"}";' href="playba_allocine.php?url={$FILMS[films].video|urlencode}&from_start={$MIN}">{$FILMS[films].titre|truncate:40} <img src="video.gif" border=0 width=20 height=20></a>
+ {else}
+ {$FILMS[films].titre|truncate:40}
+ {/if}
+ <br>
+ <font size="1">{$FILMS[films].desc|truncate:400}</font>
+ </td>
+ </tr>
+{/section}
+</table>
+
+{if $MIN+$smarty.section.films.total<count($FILMS)}
+ {assign var=temp value=$MIN+3}
+ {attribbouton touche="blue" lien="index1.php?start=$temp"}
+ <a href="index1.php?start={$temp}"><img src="{$INTERFACE_REP}btn_bleu.gif" border="0"> Suivant</a>
+
+{/if}
+
Added: trunk/module/allocine/icone.gif
===================================================================
(Binary files differ)
Property changes on: trunk/module/allocine/icone.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/module/allocine/index1.php
===================================================================
--- trunk/module/allocine/index1.php (rev 0)
+++ trunk/module/allocine/index1.php 2007-05-01 10:45:52 UTC (rev 136)
@@ -0,0 +1,50 @@
+<?php
+$RACINE_REP = "../../";
+require($RACINE_REP.'_framework/framework.php');
+
+include_once('jf_extralib.php');
+
+$rss = 'http://rss.allocine.fr/bandesannonces/archos';
+$xml = file_get_contentsJF($rss, true);
+$xml = simplexml_load_string($xml);
+
+$title = utf8_decode($xml->channel->title);
+$description = utf8_decode($xml->channel->description);
+
+$films=array();
+$contents = '<table border="0" cellpadding="0" cellspacing="0" width="500" height="360" align="center">';
+foreach($xml->channel->item as $item)
+{
+
+ $attr = $item->enclosure->attributes();
+ $fvideo = '';
+ foreach($attr as $k=>$v)
+ {
+ if ($k == 'url')
+ {
+ $fvideo = (string)$v;
+ break;
+ }
+ }
+ $ftitre = utf8_decode((string)$item->title);
+ $fdesc = strip_tags(
+ utf8_decode((string)$item->description)
+ ,'<b><br><br/><br />');
+
+ $fimage = (string)$item->image->url;
+ $films[] = array('titre'=>$ftitre, 'desc'=>$fdesc, 'video'=>$fvideo, 'image'=>$fimage);
+
+}
+
+$LINK['red'] = page_retour_menu();
+
+$smarty->assign('content', $contents);
+
+$smarty->assign('FILMS', $films);
+$smarty->assign('TITRE',$title);
+$smarty->assign('DESCRIPTION', $description);
+$smarty->assign('MIN',$_GET['start']);
+
+$smarty->assign('CONTENT',$smarty->fetch('allocine.tpl'));
+$smarty->display('interface.tpl');
+?>
\ No newline at end of file
Added: trunk/module/allocine/jf_extralib.php
===================================================================
--- trunk/module/allocine/jf_extralib.php (rev 0)
+++ trunk/module/allocine/jf_extralib.php 2007-05-01 10:45:52 UTC (rev 136)
@@ -0,0 +1,84 @@
+<?
+define('PROXY_NAME', '');
+//define('PROXY_NAME', '172.18.234.15'); //
+//define('PROXY_PORT', 3128);
+define('CACHE_DIR', dirname(__FILE__).'/cache/');
+
+function __log($str)
+{
+return;
+/*
+ $fd = fopen(dirname(__FILE__).'/log.txt', 'a');
+ fputs($fd, date('r').'>');
+ fputs($fd, $str);
+ fputs($fd, "\n");
+ fclose($fd);
+ */
+}
+
+function proxy_urlJF($proxy_url)
+{
+ $proxy_cont = '';
+
+ $proxy_fp = fsockopen(PROXY_NAME, PROXY_PORT);
+ if (!$proxy_fp) {return false;}
+ fputs($proxy_fp, "GET $proxy_url HTTP/1.0\r\nHost: $proxy_name\r\n\r\n");
+ while(!feof($proxy_fp))
+ {
+ $proxy_cont .= fread($proxy_fp,4096);
+ }
+ fclose($proxy_fp);
+ $proxy_cont = substr($proxy_cont, strpos($proxy_cont,"\r\n\r\n")+4);
+ return $proxy_cont;
+}
+
+/**
+ * Cette fonction retourne sous forme de string le contenu d'un fichier ($url).
+ * Si le fichier est distant, on peut utiliser un cache ($usecache = true) qui
+ * expirera au bout d'un certain temps ($cachetimeout)
+ **/
+function file_get_contentsJF($url, $usecache = false, $cachetimeout = 3600)
+{
+ __log("file_get_contents($url, $usecache, $cachetimeout)");
+ if(strpos($url, 'http:') === 0 ||
+ strpos($url, 'https:') === 0 ||
+ strpos($url, 'ftp:') === 0)
+ {
+ // Distant.
+ if ($usecache === false)
+ {
+ if (PROXY_NAME != '')
+ $content = proxy_urlJF($url);
+ else
+ $content = file_get_contents($url);
+ return $content;
+ }
+ else
+ {
+ // On regarde dans le cache d'abord
+ $md5url = md5($url);
+ if (@filemtime(CACHE_DIR.$md5url) < time() - $cachetimeout)
+ {
+ if (PROXY_NAME != '')
+ $content = proxy_urlJF($url);
+ else
+ $content = file_get_contents($url);
+ $fd = fopen(CACHE_DIR.$md5url, 'wb');
+ fputs($fd, $content);
+ fclose($fd);
+ touch(CACHE_DIR.$md5url);
+ return $content;
+ }
+ else
+ {
+ return file_get_contents(CACHE_DIR.$md5url);
+ }
+ }
+ }
+ else
+ {
+ // local
+ return file_get_contents($url);
+ }
+}
+?>
\ No newline at end of file
Added: trunk/module/allocine/playba_allocine.php
===================================================================
--- trunk/module/allocine/playba_allocine.php (rev 0)
+++ trunk/module/allocine/playba_allocine.php 2007-05-01 10:45:52 UTC (rev 136)
@@ -0,0 +1,49 @@
+<?php /// __JF
+
+$RACINE_REP = "../../";
+require($RACINE_REP.'_framework/framework.php');
+$BACKGROUND='none';
+
+$url = $_REQUEST['url'];
+
+if ($url == '')
+{
+}
+else
+{
+ save_variable('start', $_REQUEST['from_start']);
+ save_variable('backToURL', dirname($_SERVER['SCRIPT_NAME']).'/index1.php?start='.$_REQUEST['from_start']);
+ play_fichier('type=40',
+ str_replace(' ','%20',$url),
+ 0,
+ 'backToURL',
+ $_REQUEST['titre']);
+ //echo $basename;
+}
+ $LINK['stop']=$MODULE.'films/lecture.php?control=stop';
+ $LINK['play']=$MODULE.'films/lecture.php?control=play';
+ $LINK['pause']=$MODULE.'films/lecture.php?control=pause';
+ $LINK['info']=$MODULE.'films/info.php';
+ $LINK['options']=$MODULE.'films/info.php';
+ $LINK['blue']=$MODULE.'films/lecture.php?savesignet=1';
+ $LINK['red']=$MODULE.'films/lecture.php?next_ss=1';
+ $LINK['yellow']=$MODULE.'films/info.php?module=infos';
+ $LINK['up']=$MODULE.'films/lecture.php?seek_value=plus';
+ $LINK['down']=$MODULE.'films/lecture.php?seek_value=moins';
+
+ // BDE - RequestID 1588902
+ $LINK['next']=$MODULE.'films/lecture.php?control=next';
+ $LINK['prev']=$MODULE.'films/lecture.php?control=previous';
+ $LINK['rev']=$MODULE.'films/lecture.php?seek_value=moins';
+ $LINK['fwd']=$MODULE.'films/lecture.php?seek_value=plus';
+
+?>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
+<html>
+<head>
+<meta name="refresh" content="0;url=../films/lecture.php">
+<script language="javascript" src="/fb2ie.js">
+</script>
+</head>
+<body></body></html>
+
Added: trunk/module/allocine/video.gif
===================================================================
(Binary files differ)
Property changes on: trunk/module/allocine/video.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ara...@us...> - 2007-04-29 10:23:30
|
Revision: 131
http://svn.sourceforge.net/easybox-mod/?rev=131&view=rev
Author: aragornis
Date: 2007-04-29 03:23:27 -0700 (Sun, 29 Apr 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/module/dailymotion/index1.php
Modified: trunk/module/dailymotion/index1.php
===================================================================
--- trunk/module/dailymotion/index1.php 2007-04-28 07:57:07 UTC (rev 130)
+++ trunk/module/dailymotion/index1.php 2007-04-29 10:23:27 UTC (rev 131)
@@ -12,23 +12,24 @@
array('lien'=>'index1.php?show=rec', 'nom'=>'Recherche', 'selected'=>$show=='rec'));
$title = array('hit'=>'Les plus r\xE9cents', 'new'=>'Les plus vus', 'tous'=>'Les mieux not\xE9s', 'rec'=>'Recherche');
-$smarty->assign('TITRE','Vid\xE9os Youtube - '.$title[$show]);
+$smarty->assign('TITRE','Vid\xE9os Dailymotion - '.$title[$show]);
function get_videos_id($page){
$xml = simplexml_load_file($page);
-
- foreach($xml->channel->item as $item){
- $img = '';
- foreach($item->xpath('media:thumbnail') as $k){
- $img = $k['url'];
- }
- foreach($item->xpath('enclosure') as $k){
- $url = $k['url'];
- $length = intval($k['length']);
- }
- $vid = $item->xpath('media:group/media:content');
-
- $retour[] = array('temps'=>date('i:s',$length), 'titre'=>utf8_decode($item->title), 'url'=>$vid[0]['url'], 'img'=>$img);
+ if(count($xml->channel->item)!=0){
+ foreach($xml->channel->item as $item){
+ $img = '';
+ foreach($item->xpath('media:thumbnail') as $k){
+ $img = $k['url'];
+ }
+ foreach($item->xpath('enclosure') as $k){
+ $url = $k['url'];
+ $length = intval($k['length']);
+ }
+ $vid = $item->xpath('media:group/media:content');
+
+ $retour[] = array('temps'=>date('i:s',$length), 'titre'=>utf8_decode($item->title), 'url'=>$vid[0]['url'], 'img'=>$img);
+ }
}
return($retour);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ara...@us...> - 2007-04-28 07:57:14
|
Revision: 130
http://svn.sourceforge.net/easybox-mod/?rev=130&view=rev
Author: aragornis
Date: 2007-04-28 00:57:07 -0700 (Sat, 28 Apr 2007)
Log Message:
-----------
Rajout des titres dans mes 3 modules
Modified Paths:
--------------
trunk/module/clips/index1.php
trunk/module/dailymotion/index1.php
trunk/module/youtube/index1.php
Modified: trunk/module/clips/index1.php
===================================================================
--- trunk/module/clips/index1.php 2007-04-27 19:24:05 UTC (rev 129)
+++ trunk/module/clips/index1.php 2007-04-28 07:57:07 UTC (rev 130)
@@ -11,6 +11,8 @@
array('lien'=>'index1.php?show=tous', 'nom'=>'Tous', 'selected'=>$show=='tous'),
array('lien'=>'index1.php?show=rec', 'nom'=>'Recherche', 'selected'=>$show=='rec'));
+$title = array('hit'=>'Le Hit 100', 'new'=>'Les nouveaut\xE9s', 'tous'=>'Tous', 'rec'=>'Recherche');
+$smarty->assign('TITRE','Clips - '.$title[$show]);
function get_videos_id($page){
$contenu = str_replace("\r\n",'',@file_get_contents($page));
Modified: trunk/module/dailymotion/index1.php
===================================================================
--- trunk/module/dailymotion/index1.php 2007-04-27 19:24:05 UTC (rev 129)
+++ trunk/module/dailymotion/index1.php 2007-04-28 07:57:07 UTC (rev 130)
@@ -11,6 +11,8 @@
array('lien'=>'index1.php?show=note', 'nom'=>'Mieux not\xE9s', 'selected'=>$show=='note'),
array('lien'=>'index1.php?show=rec', 'nom'=>'Recherche', 'selected'=>$show=='rec'));
+$title = array('hit'=>'Les plus r\xE9cents', 'new'=>'Les plus vus', 'tous'=>'Les mieux not\xE9s', 'rec'=>'Recherche');
+$smarty->assign('TITRE','Vid\xE9os Youtube - '.$title[$show]);
function get_videos_id($page){
$xml = simplexml_load_file($page);
Modified: trunk/module/youtube/index1.php
===================================================================
--- trunk/module/youtube/index1.php 2007-04-27 19:24:05 UTC (rev 129)
+++ trunk/module/youtube/index1.php 2007-04-28 07:57:07 UTC (rev 130)
@@ -11,6 +11,8 @@
array('lien'=>'index1.php?show=note', 'nom'=>'Mieux not\xE9s', 'selected'=>$show=='note'),
array('lien'=>'index1.php?show=rec', 'nom'=>'Recherche', 'selected'=>$show=='rec'));
+$title = array('hit'=>'Les plus r\xE9cents', 'new'=>'Les plus vus', 'tous'=>'Les mieux not\xE9s', 'rec'=>'Recherche');
+$smarty->assign('TITRE','Vid\xE9os Youtube - '.$title[$show]);
function get_videos_id($page){
$contenu = str_replace("\n",'',@file_get_contents($page));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ara...@us...> - 2007-04-27 19:24:11
|
Revision: 129
http://svn.sourceforge.net/easybox-mod/?rev=129&view=rev
Author: aragornis
Date: 2007-04-27 12:24:05 -0700 (Fri, 27 Apr 2007)
Log Message:
-----------
Modif sur dailymotion
Modified Paths:
--------------
trunk/_utilisateur/podcast.db
trunk/_utilisateur/rss.db
trunk/module/dailymotion/index1.php
Modified: trunk/_utilisateur/podcast.db
===================================================================
(Binary files differ)
Modified: trunk/_utilisateur/rss.db
===================================================================
(Binary files differ)
Modified: trunk/module/dailymotion/index1.php
===================================================================
--- trunk/module/dailymotion/index1.php 2007-04-27 12:18:41 UTC (rev 128)
+++ trunk/module/dailymotion/index1.php 2007-04-27 19:24:05 UTC (rev 129)
@@ -24,7 +24,9 @@
$url = $k['url'];
$length = intval($k['length']);
}
- $retour[] = array('temps'=>date('i:s',$length), 'titre'=>utf8_decode($item->title), 'url'=>$url, 'img'=>$img);
+ $vid = $item->xpath('media:group/media:content');
+
+ $retour[] = array('temps'=>date('i:s',$length), 'titre'=>utf8_decode($item->title), 'url'=>$vid[0]['url'], 'img'=>$img);
}
return($retour);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ara...@us...> - 2007-04-27 12:18:46
|
Revision: 128
http://svn.sourceforge.net/easybox-mod/?rev=128&view=rev
Author: aragornis
Date: 2007-04-27 05:18:41 -0700 (Fri, 27 Apr 2007)
Log Message:
-----------
Ajout du module Dailymotion
Modified Paths:
--------------
trunk/_utilisateur/modules.db
Added Paths:
-----------
trunk/module/dailymotion/
trunk/module/dailymotion/dailymotion.tpl
trunk/module/dailymotion/icone.gif
trunk/module/dailymotion/index1.php
trunk/module/dailymotion/play_dailymotion.php
trunk/ressources/icones/Dailymotion.gif
Modified: trunk/_utilisateur/modules.db
===================================================================
(Binary files differ)
Added: trunk/module/dailymotion/dailymotion.tpl
===================================================================
--- trunk/module/dailymotion/dailymotion.tpl (rev 0)
+++ trunk/module/dailymotion/dailymotion.tpl 2007-04-27 12:18:41 UTC (rev 128)
@@ -0,0 +1,38 @@
+{assign var=NUM_ROW_AFFICH value=10}
+{section name=clip loop=$CLIP max=$NUM_ROW_AFFICH start=0}
+{cycle name=place assign=place print=false values="4,3,2,1,0"}
+ {if $smarty.section.clip.first}
+ <table border="0" cellpadding="0" cellspacing="0" width="500" align="center"><tr>
+ {if $MIN!=0}
+ <td colspan="5" align=center>{precedent}</td></tr><tr>
+ {/if}
+ {/if}
+
+ <td width="100" height="150"><a href="play_dailymotion.php?url={$CLIP[clip].url|urlencode}&show={$SHOW}&min={$MIN}&string={$string}"><table border="0" cellpadding="0" cellspacing="0" width="100" height="120" bgcolor="{#COULEUR_FOND1#}" abgcolor="{#COULEUR_TABLE_SELECTED#}"><tr height="80"><td width="100" height="80" valign="middle" align="center"><img width="80" height="60" border="0" src="{$IMG2FBX}{$CLIP[clip].img|urlencode}&new_width=80&new_height=60&cache=1"></td></tr><tr height="70"><td width="100" height="70" valign="middle" align=center><font size="1">{$CLIP[clip].titre|truncate:30:"":true|wordwrap:15:"<br>":true} ({$CLIP[clip].temps})</font></td></tr></table></a></td>
+
+ {if $smarty.section.clip.iteration is div by 5 AND NOT $smarty.section.files.last}
+ </tr><tr>
+ {/if}
+
+ {if $smarty.section.clip.last}
+ {if $place >= 4}<td> </td>{/if}
+ {if $place >= 3}<td> </td>{/if}
+ {if $place >= 2}<td> </td>{/if}
+ {if $place >= 1}<td> </td>{/if}
+ </tr>
+ <tr><td colspan="5" align="center" height="25" valign="bottom">{if $MIN+$NUM_ROW_AFFICH < $TOTAL}{suivant} - {/if}{$DEB} \xE0 {$FIN}</td></tr>
+ </table>
+ {/if}
+{sectionelse}
+ {if $SHOW=='rec'}
+ {if $string!=''}Aucune vid\xE9o trouv\xE9e pour la requ\xEAte : "{$string}".{else}Veuillez entrer votre recherche ci-dessous.{/if}
+ {/if}
+{/section}
+
+{if $SHOW=='rec'}
+<br>Recherche<br> <br><form name="form1" method="get" action="index1.php">
+<input name="show" type="hidden" value="rec">
+<input name="string" bgcolor="{#COULEUR_TEXTBOX#}" type="text" charset="digit|alpha|caps" value="" size="20">
+</form><br>
+La touche {literal}#{/literal} permet de changer entre les minuscules/majuscules et les chiffres.
+{/if}
Added: trunk/module/dailymotion/icone.gif
===================================================================
(Binary files differ)
Property changes on: trunk/module/dailymotion/icone.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/module/dailymotion/index1.php
===================================================================
--- trunk/module/dailymotion/index1.php (rev 0)
+++ trunk/module/dailymotion/index1.php 2007-04-27 12:18:41 UTC (rev 128)
@@ -0,0 +1,78 @@
+<?
+$RACINE_REP = "../../";
+require($RACINE_REP.'_framework/framework.php');
+
+ini_set('user_agent', "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.0)");
+$LINK['red']= page_retour_menu();
+(isset($_GET['show'])?$show=$_GET['show']:$show='vus');
+
+$MENU_ALT=array(array('lien'=>'index1.php?show=recent', 'nom'=>'R\xE9cents', 'selected'=>$show=='recent'),
+ array('lien'=>'index1.php?show=vus', 'nom'=>'Plus vus', 'selected'=>$show=='vus'),
+ array('lien'=>'index1.php?show=note', 'nom'=>'Mieux not\xE9s', 'selected'=>$show=='note'),
+ array('lien'=>'index1.php?show=rec', 'nom'=>'Recherche', 'selected'=>$show=='rec'));
+
+
+function get_videos_id($page){
+ $xml = simplexml_load_file($page);
+
+ foreach($xml->channel->item as $item){
+ $img = '';
+ foreach($item->xpath('media:thumbnail') as $k){
+ $img = $k['url'];
+ }
+ foreach($item->xpath('enclosure') as $k){
+ $url = $k['url'];
+ $length = intval($k['length']);
+ }
+ $retour[] = array('temps'=>date('i:s',$length), 'titre'=>utf8_decode($item->title), 'url'=>$url, 'img'=>$img);
+ }
+ return($retour);
+}
+
+if($show=='recent'){
+ $url = 'http://www.dailymotion.com/rss/';
+ $nb_p = 15;
+}elseif($show=='vus'){
+ $url = 'http://www.dailymotion.com/rss/visited-week/';
+ $nb_p = 5;
+}elseif($show=='note'){
+ $url = 'http://www.dailymotion.com/rss/rated-week/';
+ $nb_p = 5;
+}elseif($show=='rec'){
+ (isset($_GET['string'])?$string=$_GET['string']:$string='');
+ $url = 'http://www.dailymotion.com/rss/relevance/search/'.$string.'/';
+ $sup = '&string='.$string;
+}
+
+// Lancement de la gestion multipage
+start_multi('index1.php?show='.$show.$sup,10);
+
+// D\xE9termination de la page
+$page = floor($min/10)+1;
+
+$url = $url.$page;
+
+if(!($show=='rec' and $string=='')){
+ $res = get_videos_id($url);
+ if(count($res)==10){
+ $total = ($page+5)*10;
+ }else{
+ $total = ($page-1)*10+count($res);
+ }
+ $deb = ($page-1)*10+1;
+ $fin = $page*10;
+}
+
+$smarty->assign('string',$string);
+$smarty->assign('lettres',$lettres);
+$smarty->assign('SHOW',$show);
+$smarty->assign('TOTAL',$total);
+$smarty->assign('DEB',$deb);
+$smarty->assign('FIN',$fin);
+$smarty->assign('CLIP',$res);
+$smarty->assign('MIN',$min);
+$smarty->assign('START',$start);
+
+$smarty->assign('CONTENT',$smarty->fetch('dailymotion.tpl'));
+$smarty->display('interface.tpl');
+?>
Added: trunk/module/dailymotion/play_dailymotion.php
===================================================================
--- trunk/module/dailymotion/play_dailymotion.php (rev 0)
+++ trunk/module/dailymotion/play_dailymotion.php 2007-04-27 12:18:41 UTC (rev 128)
@@ -0,0 +1,38 @@
+<?php
+$RACINE_REP = "../../";
+require($RACINE_REP.'_framework/framework.php');
+$BACKGROUND='none';
+
+ $url = urldecode($_REQUEST['url']);
+
+
+ save_variable('backToURL', dirname($_SERVER['SCRIPT_NAME']).'/index1.php?show='.$_GET['show'].'&start='.$_GET['min'].'&string='.$_GET['string']);
+ play_fichier('type=40',$url,0,'backToURL');
+
+ $LINK['stop']=$MODULE.'films/lecture.php?control=stop';
+ $LINK['play']=$MODULE.'films/lecture.php?control=play';
+ $LINK['pause']=$MODULE.'films/lecture.php?control=pause';
+ $LINK['info']=$MODULE.'films/info.php';
+ $LINK['options']=$MODULE.'films/info.php';
+ $LINK['blue']=$MODULE.'films/lecture.php?savesignet=1';
+ $LINK['red']=$MODULE.'films/lecture.php?next_ss=1';
+ $LINK['yellow']=$MODULE.'films/info.php?module=infos';
+ $LINK['up']=$MODULE.'films/lecture.php?seek_value=plus';
+ $LINK['down']=$MODULE.'films/lecture.php?seek_value=moins';
+
+ // BDE - RequestID 1588902
+ $LINK['next']=$MODULE.'films/lecture.php?control=next';
+ $LINK['prev']=$MODULE.'films/lecture.php?control=previous';
+ $LINK['rev']=$MODULE.'films/lecture.php?seek_value=moins';
+ $LINK['fwd']=$MODULE.'films/lecture.php?seek_value=plus';
+
+?>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
+<html>
+<head>
+<meta name="refresh" content="0;url=../films/lecture.php">
+<script language="javascript" src="/fb2ie.js">
+</script>
+</head>
+<body></body></html>
+
Added: trunk/ressources/icones/Dailymotion.gif
===================================================================
(Binary files differ)
Property changes on: trunk/ressources/icones/Dailymotion.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ara...@us...> - 2007-04-25 17:59:12
|
Revision: 125
http://svn.sourceforge.net/easybox-mod/?rev=125&view=rev
Author: aragornis
Date: 2007-04-25 10:58:20 -0700 (Wed, 25 Apr 2007)
Log Message:
-----------
-> Acc?\195?\169l?\195?\169ration de la r?\195?\169cup?\195?\169ration des informations des films sur allocin?\195?\169
-> Les bandes annonces utilis?\195?\169es sont celles de allocin?\195?\169
-> Nouvelle pr?\195?\169sentation des fiches film avec miniatures
-> Module Yahoo-Clips avec miniatures et possibilit?\195?\169 de faire des recherches directement pour trouver le clip qui vous plait
-> R?\195?\169paration d'un bug sur la gestion pr?\195?\169c?\195?\169dent/suivant
Modified Paths:
--------------
trunk/_framework/lib/get_info.php
trunk/_framework/lib/img_cr.php
trunk/_utilisateur/modules.db
trunk/module/films/fichefilm.php
trunk/module/films/fichefilm.tpl
trunk/module/films/play.php
trunk/skin/mediacenter/framework_skin.php
trunk/skin/simple/framework_skin.php
trunk/skin/simplegreen/framework_skin.php
Added Paths:
-----------
trunk/module/clips/
trunk/module/clips/clips.tpl
trunk/module/clips/icone.gif
trunk/module/clips/index1.php
trunk/module/clips/play_clip.php
trunk/ressources/icones/Clips.gif
Removed Paths:
-------------
trunk/module/allocine/cinejf.tpl
Modified: trunk/_framework/lib/get_info.php
===================================================================
--- trunk/_framework/lib/get_info.php 2007-04-22 13:32:29 UTC (rev 124)
+++ trunk/_framework/lib/get_info.php 2007-04-25 17:58:20 UTC (rev 125)
@@ -32,7 +32,7 @@
$res['genre'] = $row['genre'];
$res['duree'] = $row['Duree'];
$res['anne_prod'] = $row['production'];
- $res['ba'] = $row['ba'];
+ $res['ba'] = unserialize($row['ba']);
$res['inbdd'] = true;
}elseif($rows2!="0" AND !$forced){
@@ -52,7 +52,7 @@
$res['genre'] = $row['genre'];
$res['duree'] = $row['Duree'];
$res['anne_prod'] = $row['production'];
- $res['ba'] = $row['ba'];
+ $res['ba'] = unserialize($row['ba']);
$res['inbdd'] = false;
}else{
@@ -60,7 +60,7 @@
// Recherche de l'id sur Allocin\xE9
if($pagerecherche = @file_get_contents('http://www.allocine.fr/recherche/?motcle='.urlencode($file).'&f=3&rub=1')){
//Critique presse (nouvelle notation et ancienne)
- $ereg = '<h4><a href="\/film\/fichefilm_gen_cfilm=(.{1,7}).html" class="link1">(.{1,100})<\/a><\/h4>';
+ $ereg = '<h4><a href="\/film\/fichefilm_gen_cfilm=(.{1,7}).html" class="link1">(.{1,150})<\/a><\/h4>';
preg_match_all("/$ereg/s", $pagerecherche, $valeur);
$mini = -1;
@@ -81,7 +81,7 @@
$res = "Erreur";
}
}
-
+
if($res != "Erreur"){
$res = info_allocineById($id);
}
@@ -89,7 +89,7 @@
$res['inbdd'] = false;
sqlite_query($db2, 'DELETE FROM film WHERE name LIKE \'%'.sqlite_escape_string($file).'%\' OR file LIKE \'%'.sqlite_escape_string($file).'%\'');
- sqlite_query($db2, 'INSERT INTO film VALUES(NULL, \''.sqlite_escape_string($file).'\', \''.sqlite_escape_string($res['nom']).'\', \''.sqlite_escape_string($res['synopsis']).'\', \''.sqlite_escape_string($res['image']).'\' , \''.sqlite_escape_string($res['date_sortie']).'\' , \''.sqlite_escape_string($res['realisateur']).'\' , \''.sqlite_escape_string($res['acteurs']).'\' , \''.sqlite_escape_string($res['nationalite']).'\' , \''.sqlite_escape_string($res['genre']).'\' , \''.sqlite_escape_string($res['duree']).'\' , \''.sqlite_escape_string($res['anne_prod']).'\' , \''.sqlite_escape_string($res['critique_visiteurs']).'\' , \''.sqlite_escape_string($res['critique_presse']).'\' , \''.sqlite_escape_string($res['ba']).'\')');
+ sqlite_query($db2, 'INSERT INTO film VALUES(NULL, \''.sqlite_escape_string($file).'\', \''.sqlite_escape_string($res['nom']).'\', \''.sqlite_escape_string($res['synopsis']).'\', \''.sqlite_escape_string($res['image']).'\' , \''.sqlite_escape_string($res['date_sortie']).'\' , \''.sqlite_escape_string($res['realisateur']).'\' , \''.sqlite_escape_string($res['acteurs']).'\' , \''.sqlite_escape_string($res['nationalite']).'\' , \''.sqlite_escape_string($res['genre']).'\' , \''.sqlite_escape_string($res['duree']).'\' , \''.sqlite_escape_string($res['anne_prod']).'\' , \''.sqlite_escape_string($res['critique_visiteurs']).'\' , \''.sqlite_escape_string($res['critique_presse']).'\' , \''.sqlite_escape_string(serialize($res['ba'])).'\')');
}
@@ -173,7 +173,20 @@
// R\xE9cup\xE9ration des bandes annonces
$ba=array();
- if($pagerecherche = @file_get_contents('http://www.cinemovies.fr/resultat_recherche.php?cherche='.urlencode($res['nom']))){
+ $ereg = 'var longueur(.*)<\/h4>';
+ preg_match("/$ereg/s", $filmrecherche, $valeur);
+
+ $ereg = 'cfilm='.$id.'.html"><img src="(.{1,250})" width="100" height="80" border="0" alt="(.{1,150})"><\/a><a href="\/video\/player_gen_cmedia';
+ preg_match_all("/$ereg/s", $valeur[1], $valeur);
+
+ foreach($valeur[1] as $key=>$ba){
+ $url = str_replace(array('img5.allocine.fr/acmedia/medias','.jpg','.gif'),array('mediaplayer.allocine.fr','_hd.flv','_hd.flv'),$ba);
+ if(@fclose(@fopen($url,'r'))){
+ $res['ba'][] = array('nom'=>$valeur[2][$key],'ba'=>$url,'img'=>$ba);
+ }
+ }
+
+ /*if($pagerecherche = @file_get_contents('http://www.cinemovies.fr/resultat_recherche.php?cherche='.urlencode($res['nom']))){
$ereg = '<a href="fiche_film.php\?IDfilm=(.{1,6})" class="bodyFont5"><b>(.{1,300})<\/b><\/a> ';
preg_match_all("/$ereg/s", $pagerecherche, $valeur);
@@ -191,7 +204,6 @@
break;
}
}
-
if($filmrecherche = @file_get_contents('http://www.cinemovies.fr/players/media.php?IDfilm='.$id)){
if(PHP_OS == "WIN32" || PHP_OS == "WINNT"){
@@ -219,7 +231,7 @@
foreach($ba as $bande){
$res['ba']=str_replace('Bande annonce','BA',$res['ba'].$bande[0]).','.$bande[1].','.$bande[2].';';
- }
+ }*/
RETURN $res;
}else{
RETURN "Aucun film trouv\xE9";
Modified: trunk/_framework/lib/img_cr.php
===================================================================
--- trunk/_framework/lib/img_cr.php 2007-04-22 13:32:29 UTC (rev 124)
+++ trunk/_framework/lib/img_cr.php 2007-04-25 17:58:20 UTC (rev 125)
@@ -23,10 +23,10 @@
$w="93";
-$img = str_replace("\\", "/",$img);
+/*$img = str_replace("\\", "/",$img);
$img = ereg_replace("//", "/",$img);
$img = str_replace("[", "*",$img);
-$img = str_replace("]", "*",$img);
+$img = str_replace("]", "*",$img);*/
define("IMAGE_FLIP_HORIZONTAL", 1);
define("IMAGE_FLIP_VERTICAL", 2);
define("IMAGE_FLIP_BOTH", 3);
Modified: trunk/_utilisateur/modules.db
===================================================================
(Binary files differ)
Deleted: trunk/module/allocine/cinejf.tpl
===================================================================
--- trunk/module/allocine/cinejf.tpl 2007-04-22 13:32:29 UTC (rev 124)
+++ trunk/module/allocine/cinejf.tpl 2007-04-25 17:58:20 UTC (rev 125)
@@ -1,36 +0,0 @@
-{section name=films loop=$FILMS max=4 start=$MIN}
-
- {cycle name=place assign=place print=false values="1,0"}
- {if $smarty.section.films.first}
- {if $MIN==0}
- {$DESCRIPTION}
- {/if}
-
- {if $MIN!=0}
- {assign var=temp value=$MIN-4}
- {attribbouton touche="green" lien="index1.php?start=$temp"}
- <a href="index1.php?&start={$temp}"><img src="{$INTERFACE_REP}btn_vert.gif" border="0"> Pr\xE9c\xE9dent</a>
- {/if}
- <table border="0" cellpadding="2" cellspacing="0" width="500" height="360" align="center"><tr>
- {/if}
- <tr><td width="90" valign="top"><img width="90" height="120" border="0" src="{$IMG2FBX}{$FILMS[films].image|urlencode}&new_width=90&new_height=120&cache=1"></td>
- <td valign=top align=left width="410">
- {if $FILMS[films].video!= ''}
- <a onfocus='front_panel="{$FILMS[films].titre|truncate:12}";' href="playba_allocine.php?url={$FILMS[films].video|urlencode}&from_start={$MIN}">{$FILMS[films].titre|truncate:40} <img src="video.gif" border=0 width=20 height=20></a>
- {else}
- {$FILMS[films].titre|truncate:40}
- {/if}
- <br>
- <font size="1">{$FILMS[films].desc|truncate:400}</font>
- </td>
- </tr>
-{/section}
-</table>
-
-{if $MIN+$smarty.section.films.total<count($FILMS)}
- {assign var=temp value=$MIN+4}
- {attribbouton touche="blue" lien="index1.php?start=$temp"}
- <a href="index1.php?start={$temp}"><img src="{$INTERFACE_REP}btn_bleu.gif" border="0"> Suivant</a>
-
-{/if}
-
Added: trunk/module/clips/clips.tpl
===================================================================
--- trunk/module/clips/clips.tpl (rev 0)
+++ trunk/module/clips/clips.tpl 2007-04-25 17:58:20 UTC (rev 125)
@@ -0,0 +1,76 @@
+{if $SHOW!='rec'}
+ {assign var=NUM_ROW_AFFICH value=10}
+ {section name=clip loop=$CLIP max=$NUM_ROW_AFFICH start=$START}
+ {cycle name=place assign=place print=false values="4,3,2,1,0"}
+ {if $smarty.section.clip.first}
+ <table border="0" cellpadding="0" cellspacing="0" width="500" align="center"><tr>
+ {if $MIN!=0}
+ <td colspan="5" align=center>{precedent}</td></tr><tr>
+ {/if}
+ {/if}
+
+ <td width="100" height="150"><a href="play_clip.php?clipid={$CLIP[clip].id}&show={$SHOW}&min={$MIN}{if $SHOW=='tous'}&lettre={$LETTRE}{/if}"><table border="0" cellpadding="0" cellspacing="0" width="100" height="120" bgcolor="{#COULEUR_FOND1#}" abgcolor="{#COULEUR_TABLE_SELECTED#}"><tr height="80"><td width="100" height="80" valign="middle" align="center"><img width="80" height="80" border="0" src="{$IMG2FBX}{$CLIP[clip].img|urlencode}&new_width=80&new_height=80&cache=1"></td></tr><tr height="70"><td width="100" height="70" valign="middle" align=center><font size="1">{$CLIP[clip].chanteur|wordwrap:18:"<br>":true}<br>{$CLIP[clip].titre|wordwrap:18:"<br>":true}</font></td></tr></table></a></td>
+
+ {if $smarty.section.clip.iteration is div by 5 AND NOT $smarty.section.files.last}
+ </tr><tr>
+ {/if}
+
+ {if $smarty.section.clip.last}
+ {if $place >= 4}
+ <td> </td>
+ {/if}
+ {if $place >= 3}
+ <td> </td>
+ {/if}
+ {if $place >= 2}
+ <td> </td>
+ {/if}
+ {if $place >= 1}
+ <td> </td>
+ {/if}
+ </tr>
+ <tr><td colspan="5" align="center" height="25" valign="bottom">{if $MIN+$NUM_ROW_AFFICH < $TOTAL}{suivant} - {/if}{$DEB+$START} \xE0 {$FIN-10+$START} sur {$TOTAL}</td></tr>
+ </table>
+
+ {if $SHOW=='tous'}
+ <TABLE cellspacing=0 cellpading=0>
+ <TR>
+ <TD align="center" width="30"><font size="1"><A hRef="index1.php?show=tous&lettre=0"><B>0-9</B></A></FONT></TD>
+ {section name=lettres loop=$lettres}
+ {if $smarty.section.lettres.iteration==14}
+ </TR><TR>
+ {/if}
+ <TD align="center" width="26"><font size="1"><A hRef="index1.php?show=tous&lettre={$lettres[lettres].0}"><B>{$lettres[lettres].1}</B></A></FONT></TD>
+ {if $smarty.section.lettres.last}
+ <TD align="center" width="30"> </TD>
+ {/if}
+ {/section}
+ </TR>
+ </TABLE>
+ {/if}
+ {/if}
+
+ {/section}
+{else}
+
+{section name=clip loop=$CLIP max=20 start=0}
+ {if $smarty.section.clip.first}
+ <table border="0" cellpadding="0" cellspacing="0" width="400" align="center">
+ {/if}
+ {cycle name=color assign=COLOR print=false values="`$smarty.config.COULEUR_INTERFACE1`,`$smarty.config.COULEUR_INTERFACE2`"}
+
+ <tr><td width="400" bgcolor="{$COLOR}"><a href="play_clip.php?clipid={$CLIP[clip].id}&show=rec&string={$string}"><table width="400" border="0" cellpadding="0" cellspacing="0" bgcolor="{$COLOR}" abgcolor="{#COULEUR_ALINK#}"><tr><td width="400">{$CLIP[clip].chanteur} - {$CLIP[clip].titre}</td></tr></table></a></td></tr>
+
+ {if $smarty.section.clip.last}
+ </table>
+ {/if}
+{sectionelse}
+ {if $string!=''}Aucun clip trouv\xE9 pour la requ\xEAte : "{$string}".{else}Veuillez entrer votre recherche ci-dessous.{/if}
+{/section}
+
+<br>Recherche<br> <br><form name="form1" method="get" action="index1.php">
+<input name="show" type="hidden" value="rec">
+<input name="string" bgcolor="{#COULEUR_TEXTBOX#}" type="text" charset="digit|alpha|caps" value="" size="20">
+</form><br>
+La touche {literal}#{/literal} permet de changer entre les minuscules/majuscules et les chiffres.
+{/if}
Added: trunk/module/clips/icone.gif
===================================================================
(Binary files differ)
Property changes on: trunk/module/clips/icone.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/module/clips/index1.php
===================================================================
--- trunk/module/clips/index1.php (rev 0)
+++ trunk/module/clips/index1.php 2007-04-25 17:58:20 UTC (rev 125)
@@ -0,0 +1,83 @@
+<?
+$RACINE_REP = "../../";
+require($RACINE_REP.'_framework/framework.php');
+
+ini_set('user_agent', "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.0)");
+$LINK['red']= page_retour_menu();
+(isset($_GET['show'])?$show=$_GET['show']:$show='hit');
+
+$MENU_ALT=array(array('lien'=>'index1.php?show=hit', 'nom'=>'Hit 100', 'selected'=>$show=='hit'),
+ array('lien'=>'index1.php?show=new', 'nom'=>'Nouveaut\xE9s', 'selected'=>$show=='new'),
+ array('lien'=>'index1.php?show=tous', 'nom'=>'Tous', 'selected'=>$show=='tous'),
+ array('lien'=>'index1.php?show=rec', 'nom'=>'Recherche', 'selected'=>$show=='rec'));
+
+
+function get_videos_id($page){
+ $contenu = str_replace("\r\n",'',@file_get_contents($page));
+ $ereg = '<table cellpadding="0"><tr><td class="listitem"><a href="http:\/\/fr.music.yahoo.com\/ar-(.{1,50})" title="(.{1,50})">(.{1,50})<\/a><\/td><\/tr><\/table><\/td><td bgcolor="(.{1,90})<td><table cellpadding="0" width="100%"><tr><td class="listheader"><a href="javascript:playLAUNCHVideo\((.{1,10})\)" class="listheader" title="(.{1,70})">(.{1,70})<\/a><\/td>(.{1,1500})photo=(.{1,150})&url';
+ preg_match_all("/$ereg/s", $contenu, $valeur);
+ foreach($valeur[2] as $key=>$val){
+ $retour[] = array('chanteur'=>$valeur[2][$key], 'titre'=>$valeur[6][$key], 'id'=>$valeur[5][$key], 'img'=>$valeur[9][$key]);
+ }
+ $ereg = '<td align="right" class="listheaderinfo">([0-9]{1,5}) - ([0-9]{1,5}) sur ([0-9]{1,5}) clips';
+ preg_match("/$ereg/s", $contenu, $valeur);
+ return(array($retour,$valeur[1],$valeur[2],$valeur[3]));
+}
+
+function get_recherche($rec){
+ $contenu = str_replace("\r\n",'',@file_get_contents('http://search.fr.music.yahoo.com/search/?p='.$rec.'&m=video'));
+ $ereg = '<td bgcolor=......><a href=javascript:playVideos\((.{1,10})\); title="(.{1,50})"><b>(.{1,50})<\/b><\/a><\/td><td bgcolor=......><a href=http:\/\/fr.music.yahoo.com\/ar-(.{1,50})><font title="(.{1,50})">(.{1,50})<\/font><\/a><\/td><td bgcolor=...... align=center class="yss_right';
+ preg_match_all("/$ereg/s", $contenu, $valeur);
+ foreach($valeur[2] as $key=>$val){
+ $retour[] = array('chanteur'=>$valeur[6][$key], 'titre'=>$valeur[2][$key], 'id'=>$valeur[1][$key]);
+ }
+ return(array($retour));
+}
+
+if($show=='hit'){
+ $url = 'http://fr.music.yahoo.com/musicvideos/lists/top.asp?';
+}elseif($show=='new'){
+ $url = 'http://fr.music.yahoo.com/musicvideos/lists/new.asp?';
+}elseif($show=='rec'){
+(isset($_GET['string'])?$string=$_GET['string']:$string='');
+}else{
+(isset($_GET['lettre'])?$lettre=$_GET['lettre']:$lettre='0');
+ $url = 'http://fr.music.yahoo.com/musicvideos/lists/byalpha.asp?l='.$lettre.'&';
+ $sup = '&lettre='.$lettre;
+}
+
+// Lancement de la gestion multipage
+start_multi('index1.php?show='.$show.$sup,10);
+
+// D\xE9termination de la page
+$page = floor($min/20)+1;
+
+if((20*($page-1))==$min){
+ $start = 0;
+}else{
+ $start = 10;
+}
+
+if($show=='rec' and $string!=''){
+ $res = get_recherche($string);
+}else{
+ $res = get_videos_id($url.'p='.$page);
+}
+
+for ($i=0; $i<26; $i++){
+ $lettres[] = array(chr(97+$i),chr(65+$i));
+}
+$smarty->assign('LETTRE',$lettre);
+$smarty->assign('string',$string);
+$smarty->assign('lettres',$lettres);
+$smarty->assign('SHOW',$show);
+$smarty->assign('TOTAL',$res[3]);
+$smarty->assign('DEB',$res[1]);
+$smarty->assign('FIN',$res[2]);
+$smarty->assign('CLIP',$res[0]);
+$smarty->assign('MIN',$min);
+$smarty->assign('START',$start);
+
+$smarty->assign('CONTENT',$smarty->fetch('clips.tpl'));
+$smarty->display('interface.tpl');
+?>
Added: trunk/module/clips/play_clip.php
===================================================================
--- trunk/module/clips/play_clip.php (rev 0)
+++ trunk/module/clips/play_clip.php 2007-04-25 17:58:20 UTC (rev 125)
@@ -0,0 +1,53 @@
+<?php
+
+$RACINE_REP = "../../";
+require($RACINE_REP.'_framework/framework.php');
+$BACKGROUND='none';
+ini_set('user_agent', "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.0)");
+$id = $_REQUEST['clipid'];
+$cookies = "LYC=l_v=1&l_lv=10&l_s=u02qvvtyuzzzuu43yqt44yuyvsxrq3sr&l_lid=cmsj68&l_lc=0_1_0_0_-1&l_um=0_0_1_0_0&l_mv=110_50; playerFullVersion=10; vCodec=9; LYS=l_fh=0&l_vo=myla; MVUserInfo3=130_10; B=14ojnad32otbe&b=3&s=9j; PVL=40276897_2159649_40553920_15703100_2157949_2162142_41461546_18875473_36490724_40687675_19050971_2158320_40554555_27145900_8975431_16235274_24934257_39147034_30161054_21242329_32585395_17968017_41461543_2156756|26_13_26_13_13_13_26_13_13_26_13_13_26_13_13_13_13_26_13_13_13_13_26_13;";
+$opts = array (
+ 'http'=>array (
+ 'method' => 'GET',
+ 'header' => "Cookie: $cookies\r\n"
+ )
+);
+
+ $content = file_get_contents('http://mv.fr.music.yahoo.com/player/default.asp?cid=613&vid="'.$id.'"&sx=default.xml&ps=&bw=&fs=&tw=calmv&vo=&redirectURL=/musicvideos/',false,stream_context_create($opts));
+
+ $ereg = "var mediaHash = '(.{1,55})';";
+ preg_match("/$ereg/s", $content, $valeur);
+ $mh = $valeur[1];
+
+ $url = 'http://launchtoday.fr.launch.yahoo.com/player/medialog.asp?vid='.$id.'&bw=510&mf=1&pid=505&ps=0&p1=2&p2=21&p3=2&rpid=35&pv=10&bp=Windows%2520NT&csid=791020104&uid=1886812234&pguid=einsJELEt4VkQCKMov00bg&etid=0&uguid=3e5u3891dirro&fcv=&mh='.$mh.'&z=ms.asx';
+
+ save_variable('backToURL', dirname($_SERVER['SCRIPT_NAME']).'/index1.php?show='.$_GET['show'].'&start='.$_GET['min'].'&lettre='.$_GET['lettre'].'&string='.$_GET['string']);
+ play_fichier('type=40',$url,0,'backToURL');
+
+ $LINK['stop']=$MODULE.'films/lecture.php?control=stop';
+ $LINK['play']=$MODULE.'films/lecture.php?control=play';
+ $LINK['pause']=$MODULE.'films/lecture.php?control=pause';
+ $LINK['info']=$MODULE.'films/info.php';
+ $LINK['options']=$MODULE.'films/info.php';
+ $LINK['blue']=$MODULE.'films/lecture.php?savesignet=1';
+ $LINK['red']=$MODULE.'films/lecture.php?next_ss=1';
+ $LINK['yellow']=$MODULE.'films/info.php?module=infos';
+ $LINK['up']=$MODULE.'films/lecture.php?seek_value=plus';
+ $LINK['down']=$MODULE.'films/lecture.php?seek_value=moins';
+
+ // BDE - RequestID 1588902
+ $LINK['next']=$MODULE.'films/lecture.php?control=next';
+ $LINK['prev']=$MODULE.'films/lecture.php?control=previous';
+ $LINK['rev']=$MODULE.'films/lecture.php?seek_value=moins';
+ $LINK['fwd']=$MODULE.'films/lecture.php?seek_value=plus';
+
+?>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
+<html>
+<head>
+<meta name="refresh" content="0;url=../films/lecture.php">
+<script language="javascript" src="/fb2ie.js">
+</script>
+</head>
+<body></body></html>
+
Modified: trunk/module/films/fichefilm.php
===================================================================
--- trunk/module/films/fichefilm.php 2007-04-22 13:32:29 UTC (rev 124)
+++ trunk/module/films/fichefilm.php 2007-04-25 17:58:20 UTC (rev 125)
@@ -16,12 +16,10 @@
$film = substr(basename($signetsav[2]),0,strrpos(basename($signetsav[2]),"."));
}
}
-
- if (isset($_REQUEST['filmid']))
- {
+
+ if (isset($_REQUEST['filmid'])){
$id=$_REQUEST['filmid'];
- } else
- {
+ }else{
$id = 0;
}
@@ -29,35 +27,27 @@
save_variable('fiche_film',$film);
- if (isset($_GET['fichier']))
- {
+ if (isset($_GET['fichier'])){
$fichier = stripslashes(urldecode($_GET['fichier']));
}
- if ($film!="" or $id!=0)
- {
+ if ($film!="" or $id!=0){
$info = info_allocine($film, false,$id);
- if ($info == "Aucun film trouv\xE9")
- {
+ if ($info == "Aucun film trouv\xE9"){
$contenant = "Aucun film trouv\xE9";
- } else if ($info == "erreur")
- {
+ }elseif ($info == "erreur"){
$contenant = "Service indisponible";
- } else
- {
- if ($info['inbdd'])
- {
+ }else{
+ if ($info['inbdd']){
$expl = Array();
$explo = explode(", ",$info['realisateur']);
- foreach ($explo as $explode)
- {
+ foreach ($explo as $explode){
array_push($expl,trim($explode));
}
sort($expl);
$info['realisateur'] = '';
- foreach ($expl as $exp)
- {
+ foreach ($expl as $exp){
if ($info['realisateur']) $info['realisateur'] .= ', ';
if ($ini['explorateur']['afficher_personnes'] == 'oui')
$info['realisateur'] .= '<a href="catalogue.php?tri=perso&suiv='.urlencode($exp).'">'.$exp.'</a>';
@@ -66,14 +56,12 @@
}
$expl = Array();
$explo = explode(", ",$info['acteurs']);
- foreach ($explo as $explode)
- {
+ foreach ($explo as $explode){
array_push($expl,trim($explode));
}
sort($expl);
$info['acteurs'] = '';
- foreach ($expl as $exp)
- {
+ foreach ($expl as $exp){
if ($info['acteurs']) $info['acteurs'] .= ', ';
if ($ini['explorateur']['afficher_personnes'] == 'oui')
$info['acteurs'] .= '<a href="catalogue.php?tri=perso&suiv='.urlencode($exp).'">'.$exp.'</a>';
@@ -82,50 +70,42 @@
}
$expl = Array();
$explo = explode(", ",$info['nationalite']);
- foreach ($explo as $explode)
- {
+ foreach ($explo as $explode){
array_push($expl,trim($explode));
}
sort($expl);
$info['nationalite'] = '';
- foreach ($expl as $exp)
- {
+ foreach ($expl as $exp){
if($info['nationalite']) $info['nationalite'] .= ', ';
$info['nationalite'] .= '<a href="catalogue.php?tri=film&suiv='.urlencode($exp).'">'.$exp.'</a>';
}
$expl = Array();
$explo = explode(", ",$info['genre']);
- foreach ($explo as $explode)
- {
+ foreach ($explo as $explode){
array_push($expl,trim($explode));
}
sort($expl);
$info['genre'] = '';
- foreach ($expl as $exp)
- {
+ foreach ($expl as $exp){
if ($info['genre']) $info['genre'] .= ', ';
$info['genre'] .= '<a href="catalogue.php?tri=genre&suiv='.urlencode($exp).'">'.$exp.'</a>';
}
}
}
- $flux=explode(";",substr($info['ba'], 0, -1));
- $info['ba']=array();
-
- foreach ($flux as $flux1)
- {
- if($flux1!='') $info['ba'][]=explode(",",$flux1);
- }
-
- if (is_array($info['ba'])) array_cleanse($info['ba']);
-
- if ($disable)
- {
+ if(count($info['ba'])){
+ foreach($info['ba'] as $key=>$ba){
+ $t = explode(' - ',$ba['nom']);
+ $info['ba'][$key]['nom'] = stripslashes($t[1]);
+ }
+ }
+
+ if ($disable){
$smarty->assign('more','... <a href="info.php?getmoreinfo=1">Suite</a>');
- } else
- {
+ }else{
$smarty->assign('more','... <a href="fichefilm.php?getmoreinfo=1&film='.urlencode($film).'&fichier='.urlencode($fichier).'">Suite</a>');
- }
+ $smarty->assign('more2','fichefilm.php?getmorevideo=1&film='.urlencode($film).'&fichier='.urlencode($fichier));
+ }
$smarty->assign('ba',$info['ba']);
@@ -135,28 +115,46 @@
$smarty->assign('info',$info);
$smarty->assign('_GET',$_GET);
- if(isset($disable))
- {
- if ($_GET['getmoreinfo']==1)
- {
+ if(isset($disable)){
+ if ($_GET['getmoreinfo']==1){
$CONTENT .= '<font size=4>R\xE9sum\xE9 pour '.$film.'</font><br> <br> <br>';
$CONTENT .= strip_tags($info['synopsis']);
$CONTENT .= '<br> <br><a href="info.php">Retour</a>';
$contenant = $CONTENT;
- } else
- {
+ }else{
$contenant = $smarty->fetch('fichefilm.tpl');
}
- } else if ($_GET['getmoreinfo'])
- {
+ }elseif ($_GET['getmoreinfo']){
$CONTENT .= '<font size=4>R\xE9sum\xE9 pour '.$film.'</font><br> <br> <br>';
$CONTENT .= strip_tags($info['synopsis']);
$CONTENT .= '<br> <br><img src="{$INTERFACE_REP}btn_rouge.gif" border="0"> <a href="fichefilm.php?film='.urlencode($film).'&fichier='.urlencode($fichier).'">Retour</a>';
$LINK['red'] = 'fichefilm.php?film='.urlencode($film).'&fichier='.urlencode($fichier);
$smarty->assign('AVERTISSEMENT',$CONTENT);
$smarty->display('avertissement.tpl');
- } else
- {
+ }elseif ($_GET['getmorevideo']){
+ $CONTENT .= '<font size=4>Toutes les vid\xE9os pour '.$film.'</font><br> <br><table border="0" cellpadding="0" cellspacing="0" width="500" height="100" align="center"><tr>';
+ $i=1;
+ $c=count($info['ba']);
+ foreach($info['ba'] as $ba){
+ $CONTENT .= '<td><a href="play.php?toplay='.urlencode($ba['ba']).'&titre='.urlencode($info['nom']).'&type=ba"><table border="0" cellpadding="0" cellspacing="0" width="80" height="100" bgcolor="'.$_COULEUR['COULEUR_FOND1'].'" abgcolor="'.$_COULEUR['COULEUR_TABLE_SELECTED'].'"><tr height="65"><td width="80" height="65" valign="middle" align="center"><img src="'.$RACINE_REP.'_framework/lib/img_cr.php?local=1&formatw=75&formath=60&img='.urlencode($ba['img']).'" border="0" width="75" height="60"></td></tr><tr height="35"><td width="80" height="35" valign="middle" align="center">'.substr($ba['nom'],0,30).'</td></tr></table></a></td>';
+ if(($i%5)==0 and $i!=$c){
+ $CONTENT .= '</tr><tr>';
+ }
+ if($i==$c){
+ while(($i%5)!=0){
+ $i++;
+ $CONTENT .= '<td> </td>';
+ }
+ $CONTENT .= '</tr></table>';
+ }
+ $i++;
+ }
+
+ $CONTENT .= '<br> <br><img src="{$INTERFACE_REP}btn_rouge.gif" border="0"> <a href="fichefilm.php?film='.urlencode($film).'&fichier='.urlencode($fichier).'">Retour</a>';
+ $LINK['red'] = 'fichefilm.php?film='.urlencode($film).'&fichier='.urlencode($fichier);
+ $smarty->assign('AVERTISSEMENT',$CONTENT);
+ $smarty->display('avertissement.tpl');
+ }else{
$smarty->assign('CONTENT',$smarty->fetch('fichefilm.tpl'));
$smarty->display('interface.tpl');
}
Modified: trunk/module/films/fichefilm.tpl
===================================================================
--- trunk/module/films/fichefilm.tpl 2007-04-22 13:32:29 UTC (rev 124)
+++ trunk/module/films/fichefilm.tpl 2007-04-25 17:58:20 UTC (rev 125)
@@ -2,8 +2,8 @@
<table cellspacing=0 align="center">
<tr><td width="120" height="160"><img src="{$IMG2FBX}{$info.image|urlencode}&cache=1"></td>
<td width="369">
- <font size="4"><u>{$info.nom}</u></font>{if file_exists($fichier)!=''} - <a href="play.php?toplay={$fichier|urlencode}">Lire le film avec Easybox</a>{/if}
- <br><u>Date de sortie</u> : {$info.date_sortie|date_format:"%d/%m/%Y"}
+ <font size="4"><u>{$info.nom}</u></font>{if file_exists($fichier)!=''} - <a href="play.php?toplay={$fichier|urlencode}">Lire le film avec Easybox</a>{/if}{if $_GET.togo=='cine'}<a href="/module/seances/voirsalle.php?salle={$_GET.salle}"> - Retour \xE0 la liste des films du cin\xE9ma</a>{/if}
+ <br><u>Date de sortie</u> : {$info.date_sortie|date_format:"%d/%m/%Y"}
<br><u>R\xE9alis\xE9 par</u> {$info.realisateur}
<br><u>Avec</u> {$info.acteurs}
<br><u>Film</u> {$info.nationalite} de {$info.anne_prod}
@@ -11,16 +11,23 @@
<br><u>Notes</u> : Presse <img src="{$INTERFACE_REP}star{$info.critique_presse}.gif"> Spectateurs <img src="{$INTERFACE_REP}star{$info.critique_visiteurs}.gif">
</td><tr><td colspan="2">
<u>Synopsis</u><br>
- {$info.synopsis|strip_tags|wordwrap:60|htmlentities|truncate:650:$more}
+ {$info.synopsis|strip_tags|wordwrap:60|htmlentities|truncate:530:$more}
<br>
- {section name=ba loop=$ba}
- <a href="playba.php?toplay={$ba[ba].2}&titre={$info.nom|urlencode}"><img src="{$INTERFACE_REP}{$ba[ba].1}.gif" border=0 width=20 height=20> {$ba[ba].0}</a>
- {if !$smarty.section.ba.last} - {/if}
- {/section}
+ {if NOT $disable}
+ {section name=ba loop=$ba max=5}
+ {if $smarty.section.ba.first}
+ <table border="0" cellpadding="0" cellspacing="0" width="500" height="100" align="center"><tr>
+ {/if}
+ <td><a href="play.php?toplay={$ba[ba].ba|urlencode}&titre={$info.nom|urlencode}&type=ba"><table border="0" cellpadding="0" cellspacing="0" width="80" height="100" bgcolor="{#COULEUR_FOND1#}" abgcolor="{#COULEUR_TABLE_SELECTED#}"><tr height="65"><td width="80" height="65" valign="middle" align="center"><img src="{$RACINE_REP}_framework/lib/img_cr.php?local=1&formatw=75&formath=60&img={$ba[ba].img|urlencode}" border="0" width="75" height="60"></td></tr><tr height="35"><td width="80" height="35" valign="middle" align="center">{$ba[ba].nom|truncate:20:"":true}</td></tr></table></a></td>
+ {if $smarty.section.ba.last}
+ {if count($ba)>$smarty.section.ba.total}
+ <td><a href="{$more2}"><table border="0" cellpadding="0" cellspacing="0" width="80" height="100" bgcolor="{#COULEUR_FOND1#}" abgcolor="{#COULEUR_TABLE_SELECTED#}"><tr height="65"><td width="80" height="65" valign="middle" align="center"><img src="{$RACINE_REP}_framework/lib/img_cr.php?local=1&formatw=75&formath=60&img={'http://a69.g.akamai.net/n/69/10688/v1/img5.allocine.fr/acmedia/skin/AlloCineV5/habillage/affichettemedia.gif'|urlencode}" border="0" width="75" height="60"></td></tr><tr height="35"><td width="80" height="35" valign="middle" align="center">Plus de vid\xE9os</td></tr></table></a></td>
+ {/if}
+ </tr></table>
+ {/if}
+ {/section}
+ {/if}
- {if $_GET.togo=='cine'}
- <br><a href="/module/seances/voirsalle.php?salle={$_GET.salle}">Retour \xE0 la liste des films du cin\xE9ma</a>
- {/if}
</td></tr></table>
{elseif $disable}
<center><font size="4">Aucune information disponible pour <br><u>{$fichier}</u></font><br></font>
Modified: trunk/module/films/play.php
===================================================================
--- trunk/module/films/play.php 2007-04-22 13:32:29 UTC (rev 124)
+++ trunk/module/films/play.php 2007-04-25 17:58:20 UTC (rev 125)
@@ -102,6 +102,8 @@
if($_GET['type']=='jt'){
play_fichier($playweb,$basename,0,'jt');
+}elseif($_GET['type']=='ba'){
+ play_fichier($playweb,$basename,0,'ba',$_REQUEST['titre']);
}elseif($_GET['type']=='webtv'){
play_fichier($playweb,$basename,0,'webtv');
}elseif(eregi("http://",$basename) || eregi("mms://",$basename)){
Added: trunk/ressources/icones/Clips.gif
===================================================================
(Binary files differ)
Property changes on: trunk/ressources/icones/Clips.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/skin/mediacenter/framework_skin.php
===================================================================
--- trunk/skin/mediacenter/framework_skin.php 2007-04-22 13:32:29 UTC (rev 124)
+++ trunk/skin/mediacenter/framework_skin.php 2007-04-25 17:58:20 UTC (rev 125)
@@ -64,13 +64,13 @@
}
function _multipage_prec(){
-global $_multipage_lien, $_multipage_step, $MENU_ALT, $INTERFACE_REP, $min;
+global $_multipage_lien, $_multipage_step, $MENU_ALT, $INTERFACE_REP, $min, $LINK;
$MENU_ALT[]=array('lien'=>$_multipage_lien.'&start='.max(0,$min-$_multipage_step), 'nom'=>'<img src="'.$INTERFACE_REP.'btn_vert.gif" border="0"> Pr\xE9c\xE9dent', 0,'front_pannel'=>'Pr\xE9c\xE9dent');
$LINK['green']=$_multipage_lien.'&start='.max(0,$min-$_multipage_step);
}
function _multipage_suiv(){
-global $_multipage_lien, $_multipage_step, $MENU_ALT, $INTERFACE_REP, $min;
+global $_multipage_lien, $_multipage_step, $MENU_ALT, $INTERFACE_REP, $min, $LINK;
$MENU_ALT[]=array('lien'=>$_multipage_lien.'&start='.($min+$_multipage_step), 'nom'=>'<img src="'.$INTERFACE_REP.'btn_bleu.gif" border="0"> Suivant', 0,'front_pannel'=>'Suivant');
$LINK['blue']=$_multipage_lien.'&start='.($min+$_multipage_step);
}
Modified: trunk/skin/simple/framework_skin.php
===================================================================
--- trunk/skin/simple/framework_skin.php 2007-04-22 13:32:29 UTC (rev 124)
+++ trunk/skin/simple/framework_skin.php 2007-04-25 17:58:20 UTC (rev 125)
@@ -60,13 +60,13 @@
}
function _multipage_prec(){
-global $_multipage_lien, $_multipage_step, $MENU_ALT, $INTERFACE_REP, $min;
+global $_multipage_lien, $_multipage_step, $MENU_ALT, $INTERFACE_REP, $min, $LINK;
echo '<a href="'.$_multipage_lien.'&start='.max(0,$min-$_multipage_step).'" onfocus=\'aide="Page pr\xE9c\xE9dente";\'><img src="'.$INTERFACE_REP.'btn_vert.gif" border="0"> <font size="2">Pr\xE9c\xE9dent</font></a>';
$LINK['green']=$_multipage_lien.'&start='.max(0,$min-$_multipage_step);
}
function _multipage_suiv(){
-global $_multipage_lien, $_multipage_step, $MENU_ALT, $INTERFACE_REP, $min;
+global $_multipage_lien, $_multipage_step, $MENU_ALT, $INTERFACE_REP, $min, $LINK;
echo '<a href="'.$_multipage_lien.'&start='.($min+$_multipage_step).'" onfocus=\'aide="Page suivante";\'><img src="'.$INTERFACE_REP.'btn_bleu.gif" border="0"> <font size="2">Suivant</font></a>';
$LINK['blue']=$_multipage_lien.'&start='.($min+$_multipage_step);
}
Modified: trunk/skin/simplegreen/framework_skin.php
===================================================================
--- trunk/skin/simplegreen/framework_skin.php 2007-04-22 13:32:29 UTC (rev 124)
+++ trunk/skin/simplegreen/framework_skin.php 2007-04-25 17:58:20 UTC (rev 125)
@@ -47,6 +47,28 @@
// D\xE9finit un filtre qui fait jouer le background en tout dernier lieu, quand l'ensemble des templates de la page ont \xE9t\xE9 compil\xE9s.
$smarty->register_outputfilter("background");
+// Gestion des multipages
+$smarty->register_function('precedent', '_multipage_prec');
+$smarty->register_function('suivant', '_multipage_suiv');
+function start_multi($lien,$step){
+global $_multipage_lien, $_multipage_step, $_GET, $min, $smarty;
+ $_multipage_lien = $lien;
+ $_multipage_step = $step;
+ (isset($_GET['start'])?$min=$_GET['start']:$min=0);
+ $smarty->assign('MIN',&$min);
+}
+
+function _multipage_prec(){
+global $_multipage_lien, $_multipage_step, $MENU_ALT, $INTERFACE_REP, $min, $LINK;
+ $MENU_ALT[]=array('lien'=>$_multipage_lien.'&start='.max(0,$min-$_multipage_step), 'nom'=>'<img src="'.$INTERFACE_REP.'btn_vert.gif" border="0"> Pr\xE9c\xE9dent', 0,'front_pannel'=>'Pr\xE9c\xE9dent');
+ $LINK['green']=$_multipage_lien.'&start='.max(0,$min-$_multipage_step);
+}
+
+function _multipage_suiv(){
+global $_multipage_lien, $_multipage_step, $MENU_ALT, $INTERFACE_REP, $min, $LINK;
+ $MENU_ALT[]=array('lien'=>$_multipage_lien.'&start='.($min+$_multipage_step), 'nom'=>'<img src="'.$INTERFACE_REP.'btn_bleu.gif" border="0"> Suivant', 0,'front_pannel'=>'Suivant');
+ $LINK['blue']=$_multipage_lien.'&start='.($min+$_multipage_step);
+}
?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ara...@us...> - 2007-04-17 08:50:13
|
Revision: 120
http://svn.sourceforge.net/easybox-mod/?rev=120&view=rev
Author: aragornis
Date: 2007-04-17 01:50:12 -0700 (Tue, 17 Apr 2007)
Log Message:
-----------
Added Paths:
-----------
trunk/skin/mediacenter/player/r1_c1.gif
trunk/skin/mediacenter/player/r2_c1.gif
trunk/skin/mediacenter/player/r2_c9.gif
trunk/skin/mediacenter/player/r3_c1.gif
trunk/skin/mediacenter/player/r4_c1.gif
trunk/skin/mediacenter/player/r4_c3.gif
trunk/skin/mediacenter/player/r4_c4.gif
trunk/skin/mediacenter/player/r4_c6.gif
trunk/skin/mediacenter/player/r4_c7.gif
trunk/skin/mediacenter/player/r4_c8.gif
trunk/skin/mediacenter/player/r5_c1.gif
Added: trunk/skin/mediacenter/player/r1_c1.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/mediacenter/player/r1_c1.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/mediacenter/player/r2_c1.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/mediacenter/player/r2_c1.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/mediacenter/player/r2_c9.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/mediacenter/player/r2_c9.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/mediacenter/player/r3_c1.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/mediacenter/player/r3_c1.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/mediacenter/player/r4_c1.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/mediacenter/player/r4_c1.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/mediacenter/player/r4_c3.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/mediacenter/player/r4_c3.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/mediacenter/player/r4_c4.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/mediacenter/player/r4_c4.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/mediacenter/player/r4_c6.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/mediacenter/player/r4_c6.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/mediacenter/player/r4_c7.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/mediacenter/player/r4_c7.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/mediacenter/player/r4_c8.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/mediacenter/player/r4_c8.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/mediacenter/player/r5_c1.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/mediacenter/player/r5_c1.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ara...@us...> - 2007-04-17 08:15:59
|
Revision: 119
http://svn.sourceforge.net/easybox-mod/?rev=119&view=rev
Author: aragornis
Date: 2007-04-17 01:15:58 -0700 (Tue, 17 Apr 2007)
Log Message:
-----------
Removed Paths:
-------------
trunk/skin/mediacenter/player/r1_c1.gif
trunk/skin/mediacenter/player/r2_c1.gif
trunk/skin/mediacenter/player/r2_c8.gif
trunk/skin/mediacenter/player/r3_c1.gif
trunk/skin/mediacenter/player/r4_c1.gif
trunk/skin/mediacenter/player/r4_c3.gif
trunk/skin/mediacenter/player/r4_c5.gif
trunk/skin/mediacenter/player/r4_c6.gif
trunk/skin/mediacenter/player/r4_c7.gif
trunk/skin/mediacenter/player/r5_c1.gif
Deleted: trunk/skin/mediacenter/player/r1_c1.gif
===================================================================
(Binary files differ)
Deleted: trunk/skin/mediacenter/player/r2_c1.gif
===================================================================
(Binary files differ)
Deleted: trunk/skin/mediacenter/player/r2_c8.gif
===================================================================
(Binary files differ)
Deleted: trunk/skin/mediacenter/player/r3_c1.gif
===================================================================
(Binary files differ)
Deleted: trunk/skin/mediacenter/player/r4_c1.gif
===================================================================
(Binary files differ)
Deleted: trunk/skin/mediacenter/player/r4_c3.gif
===================================================================
(Binary files differ)
Deleted: trunk/skin/mediacenter/player/r4_c5.gif
===================================================================
(Binary files differ)
Deleted: trunk/skin/mediacenter/player/r4_c6.gif
===================================================================
(Binary files differ)
Deleted: trunk/skin/mediacenter/player/r4_c7.gif
===================================================================
(Binary files differ)
Deleted: trunk/skin/mediacenter/player/r5_c1.gif
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
,array('mediaplayer.allocine.fr','_hd.flv','_hd.flv'),$ba);){kind=link}
