Menu
▾
▴
easybox-mod-developers
|
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: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: <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-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: <ara...@us...> - 2007-05-21 16:17:15
|
Revision: 155
http://svn.sourceforge.net/easybox-mod/?rev=155&view=rev
Author: aragornis
Date: 2007-05-21 09:17:12 -0700 (Mon, 21 May 2007)
Log Message:
-----------
-> Nouvelle classe de gestion des images unifi?\195?\169e
-> Utilisation par tous les modules existants de cette classe
Modified Paths:
--------------
trunk/_framework/demarrage.php
trunk/_framework/fonctions_partagees.inc.php
trunk/_framework/framework.php
trunk/_framework/lib/get_info.php
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/films/catalogue_video.tpl
trunk/module/films/fichefilm.php
trunk/module/films/fichefilm.tpl
trunk/module/films/lecture.php
trunk/module/films/play.php
trunk/module/guidetv/guidetv.tpl
trunk/module/modules/modules.tpl
trunk/module/mp3/playlist_audio.tpl
trunk/module/recettes/recettes2.tpl
trunk/module/rss/rss.tpl
trunk/module/seances/programme_cine.tpl
trunk/module/stage6/stage6.tpl
trunk/module/youtube/youtube.tpl
trunk/skin/mediacenter/config_skin.php
trunk/skin/simple/config_skin.php
trunk/skin/simplegreen/config_skin.php
Added Paths:
-----------
trunk/_framework/lib/lib_photo.php
Removed Paths:
-------------
trunk/_framework/cr_xml.php
trunk/_framework/lib/date.php
trunk/_framework/login.php
Deleted: trunk/_framework/cr_xml.php
===================================================================
--- trunk/_framework/cr_xml.php 2007-05-20 22:42:20 UTC (rev 154)
+++ trunk/_framework/cr_xml.php 2007-05-21 16:17:12 UTC (rev 155)
@@ -1,125 +0,0 @@
-<?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
Modified: trunk/_framework/demarrage.php
===================================================================
--- trunk/_framework/demarrage.php 2007-05-20 22:42:20 UTC (rev 154)
+++ trunk/_framework/demarrage.php 2007-05-21 16:17:12 UTC (rev 155)
@@ -13,7 +13,7 @@
$CACHE_IMAGE = $RACINE_REP."_utilisateur/cache/";
$MODULE = $RACINE_REP."module/";
$LECTEUR = $RACINE_REP."lecteur/";
- $IMG2FBX = $FRAMEWORK_REP."img2fbx.php?sURL=";
+ $IMG2FBX = $LIBRARIES_REP.'lib_photo.php';
$EXPLORATEUR = $MODULE."_explorateur/index1.php";
$PLAYLIST = $USER."playlist/";
$AIDE_REP = $RACINE_REP."_framework/aide/";
Modified: trunk/_framework/fonctions_partagees.inc.php
===================================================================
--- trunk/_framework/fonctions_partagees.inc.php 2007-05-20 22:42:20 UTC (rev 154)
+++ trunk/_framework/fonctions_partagees.inc.php 2007-05-21 16:17:12 UTC (rev 155)
@@ -822,7 +822,7 @@
}
function recharger_vlc(){
-global $smarty, $VLC, $contenu_html;
+global $smarty, $VLC, $contenu_html, $signetsav;
//-- 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>';
@@ -848,10 +848,6 @@
$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
Modified: trunk/_framework/framework.php
===================================================================
--- trunk/_framework/framework.php 2007-05-20 22:42:20 UTC (rev 154)
+++ trunk/_framework/framework.php 2007-05-21 16:17:12 UTC (rev 155)
@@ -51,7 +51,7 @@
$RES_ICO = $RESSOURCES.'icones/';
$smarty->assign('RES_ICO',$RES_ICO);
- $IMG2FBX = $FRAMEWORK_REP.'img2fbx.php?sURL=';
+ $IMG2FBX = $LIBRARIES_REP.'lib_photo.php';
$smarty->assign('IMG2FBX',$IMG2FBX);
$LOAD = $FRAMEWORK_REP.'fonctions_partagees.inc.php';
require_once($LOAD);
@@ -64,9 +64,6 @@
$AIDE_REP = $RACINE_REP.'_framework/aide/';
$smarty->assign('AIDE_REP',$AIDE_REP);
-//-- Librairie permettant de formater et convertir des dates
- require_once($LIBRARIES_REP.'date.php');
-
//-- Librairie permettant de gerer les fichier ZIP
require_once($LIBRARIES_REP.'zip.php');
Deleted: trunk/_framework/lib/date.php
===================================================================
--- trunk/_framework/lib/date.php 2007-05-20 22:42:20 UTC (rev 154)
+++ trunk/_framework/lib/date.php 2007-05-21 16:17:12 UTC (rev 155)
@@ -1,119 +0,0 @@
-<?
-/*
- * 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));
-}
-?>
\ No newline at end of file
Modified: trunk/_framework/lib/get_info.php
===================================================================
--- trunk/_framework/lib/get_info.php 2007-05-20 22:42:20 UTC (rev 154)
+++ trunk/_framework/lib/get_info.php 2007-05-21 16:17:12 UTC (rev 155)
@@ -161,7 +161,7 @@
$res['genre'] = trim(strip_tags($valeur[1]));
//Dur\xE9e
- $ereg = '<h4>Dur\xE9e : (.{1,15}). <\/h4><h4>';
+ $ereg = '<h4>Dur\xE9e : (.{1,15}). <\/h4>';
preg_match("/$ereg/s", $filmrecherche, $valeur);
$res['duree'] = $valeur[1];
Added: trunk/_framework/lib/lib_photo.php
===================================================================
--- trunk/_framework/lib/lib_photo.php (rev 0)
+++ trunk/_framework/lib/lib_photo.php 2007-05-21 16:17:12 UTC (rev 155)
@@ -0,0 +1,265 @@
+<?php
+
+$RACINE_REP = realpath('../../');
+$CACHE_IMAGE = $RACINE_REP.'/_utilisateur/cache/';
+
+class image {
+
+// Adresse de l'image
+var $url;
+
+// Variable contenant l'image
+var $img;
+
+// Largeur et hauteur de $img \xE0 chaque instant
+var $width;
+var $height;
+
+// Largeur et hauteur d\xE9sir\xE9s
+var $r_width;
+var $r_height;
+
+// Rotation \xE0 effectuer
+var $angle;
+
+// Le fichier doit \xEAtre mis en cache/r\xE9cup\xE9r\xE9 du cache ou non
+var $cache;
+// Le fichier est d\xE9j\xE0 en cache ou non
+var $is_cached;
+
+// Le hash du fichier
+var $hash;
+
+// Profil qualit\xE9 (pour le redimensionnement)
+var $quality;
+
+// Version de la Freebox
+var $fbx;
+
+// Nouvelle extension du fichier
+var $new_ext;
+
+// Nouveau content-type
+var $content;
+
+// Path du fichier en cache
+var $name_cache;
+
+function __construct($url, $r_width, $r_height, $angle, $cache, $quality){
+global $_SERVER, $CACHE_IMAGE;
+ $this->url = $url;
+ $this->cache = $cache;
+ $this->r_width = $r_width;
+ $this->r_height = $r_height;
+ $this->angle = $this->arg($angle);
+ $this->cache = $cache;
+ $this->quality = $quality;
+ $this->hash = md5($this->url.$this->r_height.$this->r_width.$this->angle);
+
+ define("IMAGE_FLIP_HORIZONTAL", 1);
+ define("IMAGE_FLIP_VERTICAL", 2);
+ define("IMAGE_FLIP_BOTH", 3);
+
+ // D\xE9termine la version de la freebox pour cr\xE9er des fichiers png (v5 HD) ou gif (V3 ou V4)
+ $vers_fbx = $_SERVER["HTTP_USER_AGENT"];
+ $ereg = 'freebox\/[0-9]\.[0-9]\.[0-9] \(hw:([0-9]).0;';
+ if(preg_match("/$ereg/s", $vers_fbx, $val_vers)){
+ $this->fbx = $val_vers[1];
+ }else{
+ $this->fbx = 5;
+ }
+
+ // Change le format d'exportation selon la version de la freebox
+ if($this->fbx==5){
+ $this->new_ext = 'png';
+ $this->content = 'Content-type: image/png';
+ }else{
+ $this->new_ext = 'gif';
+ $this->content = 'Content-type: image/gif';
+ }
+
+ // D\xE9termine le nom th\xE9orique du fichier cache correspondant
+ $this->name_cache = $CACHE_IMAGE.$this->hash.'.'.$this->new_ext;
+
+ // D\xE9termine si il existe un fichier en cache
+ if($this->cache){
+ $this->is_cached = $this->is_cached();
+ }else{
+ $this->is_cached = false;
+ }
+
+}
+
+// D\xE9termine si il existe un fichier en cache
+function is_cached(){
+ RETURN file_exists($this->name_cache);
+}
+
+// G\xE9n\xE8re le fichier cache
+function generer_fichier(){
+ if($this->new_ext=='gif'){
+ imagegif($this->img,$this->name_cache);
+ }elseif($this->new_ext=='png'){
+ imagepng($this->img,$this->name_cache);
+ }
+}
+
+// Affiche l'image dans le fichier
+function afficher_image(){
+ header($this->content);
+ if($this->new_ext=='gif'){
+ imagegif($this->img);
+ }elseif($this->new_ext=='png'){
+ imagepng($this->img);
+ }
+}
+
+// Execute les actions demand\xE9es
+function process(){
+ // Dans le cas o\xF9 le fichier est d\xE9j\xE0 en cache, on le charge directement
+ if($this->is_cached){
+ header($this->content);
+ readfile($this->name_cache);
+ // Sinon on charge l'image et on execute les demandes
+ }else{
+ if($data = file_get_contents($this->url)){
+ $this->img = imagecreatefromstring($data);
+ $this->width = imagesx($this->img);
+ $this->height = imagesy($this->img);
+
+ // Tourner
+ $this->tourner();
+
+ // Redimensionner
+ if($this->width!=0 AND $this->height!=0){
+ $this->redimensionner();
+ }
+
+
+ // Mettre en cache
+ if($this->cache){
+ $this->generer_fichier();
+ }
+
+ // Renvoyer
+ $this->afficher_image();
+
+ }else{
+ $this->error();
+ }
+ }
+}
+
+// Fonction d'erreur
+function error(){
+
+}
+
+// Fonction trouvant le bon argument entre 0 et 360
+function arg($angle){
+ $ang = fmod($angle,360);
+ while($ang<0 and $fail>500){
+ $fail++;
+ $ang+=360;
+ }
+ return $ang;
+}
+
+function redimensionner(){
+ $pourcent = min(min(($this->r_width/$this->width),1),min(($this->r_height/$this->height),1));
+ $redimx = floor($this->width*$pourcent);
+ $redimy = floor($this->height*$pourcent);
+ $image1 = imagecreatetruecolor($redimx, $redimy);
+
+ if($this->quality=='max'){
+ ImageCopyresampled($image1,$this->img,0,0,0,0,$redimx,$redimy,$this->width,$this->height);
+ }else{
+ ImageCopyresized($image1,$this->img,0,0,0,0,$redimx,$redimy,$this->width,$this->height);
+ }
+ $this->img = $image1;
+ $this->width = $redimx;
+ $this->height = $redimy;
+}
+
+function tourner(){
+ $this->img = $this->ImageRotateRightAngle($this->img,$this->angle);
+ if($this->angle==90 OR $this->angle==270){
+ $t = $this->height;
+ $this->height = $this->width;
+ $this->width = $t;
+ }
+}
+
+
+function ImageFlip($imgsrc, $type){
+ $width = $this->width;
+ $height = $this->height;
+
+ $imgdest = imagecreatetruecolor($width, $height);
+ ImageAlphaBlending($imgdest, false);
+
+ switch($type){
+ case IMAGE_FLIP_HORIZONTAL:
+ for( $y=0 ; $y<$height ; $y++ )
+ imagecopy($imgdest, $imgsrc, 0, $height-$y-1, 0, $y, $width, 1);
+ break;
+
+ case IMAGE_FLIP_VERTICAL:
+ for( $x=0 ; $x<$width ; $x++ )
+ imagecopy($imgdest, $imgsrc, $width-$x-1, 0, $x, 0, 1, $height);
+ break;
+
+ case IMAGE_FLIP_BOTH:
+ for( $x=0 ; $x<$width ; $x++ )
+ imagecopy($imgdest, $imgsrc, $width-$x-1, 0, $x, 0, 1, $height);
+
+ $rowBuffer = imagecreatetruecolor($width, 1);
+ for( $y=0 ; $y<($height/2) ; $y++ )
+ {
+ imagecopy($rowBuffer, $imgdest , 0, 0, 0, $height-$y-1, $width, 1);
+ imagecopy($imgdest , $imgdest , 0, $height-$y-1, 0, $y, $width, 1);
+ imagecopy($imgdest , $rowBuffer, 0, $y, 0, 0, $width, 1);
+ }
+
+ imagedestroy( $rowBuffer );
+ break;
+ }
+ return($imgdest);
+}
+
+function ImageRotateRightAngle($imgSrc,$angle){
+ // no need to fight
+ if( $angle == 0 ){
+ return($imgSrc);
+ }
+ // dimenstion of source image
+ $srcX = $this->width;
+ $srcY = $this->height;
+
+ switch($angle){
+ case 90:
+ $imgDest = imagecreatetruecolor($srcY,$srcX);
+ for( $x=0; $x<$srcX; $x++ )
+ for( $y=0; $y<$srcY; $y++ )
+ imagecopy($imgDest, $imgSrc, $srcY-$y-1, $x, $x, $y, 1, 1);
+ break;
+
+ case 180:
+ $imgDest = $this->ImageFlip($imgSrc,IMAGE_FLIP_BOTH);
+ break;
+
+ case 270:
+ $imgDest = imagecreatetruecolor( $srcY, $srcX );
+ for( $x=0; $x<$srcX; $x++ )
+ for( $y=0; $y<$srcY; $y++ )
+ imagecopy($imgDest, $imgSrc, $y, $srcX-$x-1, $x, $y, 1, 1);
+ break;
+ }
+ return($imgDest);
+}
+
+}
+
+$img = new image(urldecode($_GET['img']), $_GET['width'], $_GET['height'], $_GET['angle'], $_GET['cache'], $_GET['quality']);
+$img->process();
+?>
Deleted: trunk/_framework/login.php
===================================================================
--- trunk/_framework/login.php 2007-05-20 22:42:20 UTC (rev 154)
+++ trunk/_framework/login.php 2007-05-21 16:17:12 UTC (rev 155)
@@ -1,83 +0,0 @@
-<?php
-$CONFIG_INI = "../_utilisateur/configuration.ini";
-$ini1 = parse_ini_file($CONFIG_INI, TRUE);
-
-
-$acces_level = 0;
-if (isset($_GET['login'])) {
- switch ($_GET['login']) {
- case $ini1[utilisateur][level1]:
- $acces_level = 1;
- break;
- case $ini1[utilisateur][level2]:
- $acces_level = 2;
- break;
- case $ini1[utilisateur][level3]:
- $acces_level = 3;
- break;
- case $ini1[utilisateur][level4]:
- $acces_level = 4;
- break;
- case $ini1[utilisateur][level5]:
- $acces_level = 5;
- break;
- }
-}
-if ($acces_level != '0') {
- //-- On valide l'access dans le ini
- foreach($ini1 as $key2=>$inisec2){
- $reini .="\n[".$key2."]\n";
- foreach($inisec2 as $subkey2=>$entry2){
- if($subkey2=="level" && $key2=="utilisateur")
- $reini .=$subkey2.' = "'.$acces_level."\"\n";
- else
- $reini .=$subkey2.' = "'.$ini1[$key2][$subkey2]."\"\n";
- }
- }
- $handle = fopen($CONFIG_INI, "w");
- fwrite($handle, $reini);
- fclose($handle);
-
- //-- On renvois vers le menu
- $demarage = "../module/".$ini1[demarrage][demarrage];
- echo '<meta name=refresh content="0;url='.$demarrage.'">';
-
-}else{
- // on affiche la page de login
- ?>
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<title>LOGIN</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<base target="_top">
-</head>
-
-<body><center>
-<table width="645" height="510" border="0" cellpadding="0" cellspacing="0" bgcolor="#0000003F">
- <tr>
- <td height="400" align="center" valign="top"><center><img src="images/cadenas.gif" width="250" height="250"></center>
- <p> </p>
- <p> _GET : <?= $_GET['login']; ?></p>
- <p> _Level: <?= $acces_level; ?></p>
- <p> _Exemple: <?= $ini1[utilisateur][level5]; ?></p>
- <p> </p>
- <form action="login.php" method="get">
-<center>
-<input name="login" type="text" value="">
-<input name="" type="button" value="OK">
-</center>
-
-
-</form>
-<p> </p>
-<p> </p>
-<p> </p>
-<p> </p>
-</td>
- </tr>
-</table></center>
-</body>
-</html>
-<?php } ?>
Modified: trunk/module/allocine/allocine.tpl
===================================================================
--- trunk/module/allocine/allocine.tpl 2007-05-20 22:42:20 UTC (rev 154)
+++ trunk/module/allocine/allocine.tpl 2007-05-21 16:17:12 UTC (rev 155)
@@ -13,7 +13,7 @@
{/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>
+ <tr><td width="90" valign="top"><img width="90" height="120" border="0" src="{$IMG2FBX}?img={$FILMS[films].image|urlencode}&width=90&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>
Modified: trunk/module/cac40/cac40.tpl
===================================================================
--- trunk/module/cac40/cac40.tpl 2007-05-20 22:42:20 UTC (rev 154)
+++ trunk/module/cac40/cac40.tpl 2007-05-21 16:17:12 UTC (rev 155)
@@ -1,4 +1,4 @@
-<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>
+<center><img src="{$IMG2FBX}?img={"http://boursier.fininfo.fr/enhydra/cmbj/servlet/BoursierIntradayServlet?present=boursierivaleur&id1=FR0003500008&dim=450,280&typ1=area"|urlencode}&width=450&height=280" width="450" height="280"><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>
Modified: trunk/module/cinefil/sorties_cine.tpl
===================================================================
--- trunk/module/cinefil/sorties_cine.tpl 2007-05-20 22:42:20 UTC (rev 154)
+++ trunk/module/cinefil/sorties_cine.tpl 2007-05-21 16:17:12 UTC (rev 155)
@@ -5,7 +5,7 @@
<table border="0" cellpadding="0" cellspacing="0" width="500" height="360" align="center"><tr>
{/if}
- <td width="125" height="180"><a href="{$MODULE}films/fichefilm.php?film={$SORTIES[sorties].nom|urlencode}&idfilm={$SORTIES[sorties].index}"><table border="0" cellpadding="0" cellspacing="0" width="125" height="180" bgcolor="{#COULEUR_FOND1#}" abgcolor="{#COULEUR_TABLE_SELECTED#}"><tr height="130"><td width="125" height="120" valign="middle" align="center"><img width="90" height="120" border="0" src="{$IMG2FBX}{$SORTIES[sorties].image|urlencode}&new_width=90&new_height=120&cache=1"></td></tr><tr height="50"><td width="125" height="50" valign="middle" align=center><font size="1">{$SORTIES[sorties].nom|truncate:30:''}</font><br><font size="1">{$SORTIES[sorties].comment}</font></td></tr></table></a></td>
+ <td width="125" height="180"><a href="{$MODULE}films/fichefilm.php?film={$SORTIES[sorties].nom|urlencode}&idfilm={$SORTIES[sorties].index}"><table border="0" cellpadding="0" cellspacing="0" width="125" height="180" bgcolor="{#COULEUR_FOND1#}" abgcolor="{#COULEUR_TABLE_SELECTED#}"><tr height="130"><td width="125" height="120" valign="middle" align="center"><img width="90" height="120" border="0" src="{$IMG2FBX}?img={$SORTIES[sorties].image|urlencode}&width=90&height=120&cache=1"></td></tr><tr height="50"><td width="125" height="50" valign="middle" align=center><font size="1">{$SORTIES[sorties].nom|truncate:30:''}</font><br><font size="1">{$SORTIES[sorties].comment}</font></td></tr></table></a></td>
{if $smarty.section.sorties.iteration is div by 4 AND NOT $smarty.section.sorties.last}
</tr><tr>
Modified: trunk/module/clips/clips.tpl
===================================================================
--- trunk/module/clips/clips.tpl 2007-05-20 22:42:20 UTC (rev 154)
+++ trunk/module/clips/clips.tpl 2007-05-21 16:17:12 UTC (rev 155)
@@ -9,7 +9,7 @@
{/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>
+ <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}?img={$CLIP[clip].img|urlencode}&width=80&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>
Modified: trunk/module/dailymotion/dailymotion.tpl
===================================================================
--- trunk/module/dailymotion/dailymotion.tpl 2007-05-20 22:42:20 UTC (rev 154)
+++ trunk/module/dailymotion/dailymotion.tpl 2007-05-21 16:17:12 UTC (rev 155)
@@ -8,7 +8,7 @@
{/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>
+ <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}?img={$CLIP[clip].img|urlencode}&width=80&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>
Modified: trunk/module/diaporama/explorateur_photo.tpl
===================================================================
--- trunk/module/diaporama/explorateur_photo.tpl 2007-05-20 22:42:20 UTC (rev 154)
+++ trunk/module/diaporama/explorateur_photo.tpl 2007-05-21 16:17:12 UTC (rev 155)
@@ -43,7 +43,7 @@
{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>
+ <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="{$IMG2FBX}?local=1&width=88&height=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}
Modified: trunk/module/diaporama/photo.tpl
===================================================================
--- trunk/module/diaporama/photo.tpl 2007-05-20 22:42:20 UTC (rev 154)
+++ trunk/module/diaporama/photo.tpl 2007-05-21 16:17:12 UTC (rev 155)
@@ -14,7 +14,7 @@
<center>
<table width="635" height="510" border="0" cellpadding="0" cellspacing="0"><tr><td align="center" valign="top">
<table border="0" cellpadding="0" cellspacing="0" width="580" height="500">
- <tr bgcolor="#0000003f"><td align="center" valign="middle" width="580" height="462"><img border=0 src="{$RACINE_REP}_framework/lib/img_cr.php?local=1&quality=max&formatw=570&formath=460&tourne={$tourne}&img={$REP|cat:'/'|cat:$files.$aff|urlencode}"></td></tr>
+ <tr bgcolor="#0000003f"><td align="center" valign="middle" width="580" height="462"><img border=0 src="{$IMG2FBX}?img={$REP|cat:'/'|cat:$files.$aff|realpath|urlencode}&quality=max&width=570&height=460&angle={$tourne}&cache=1"></td></tr>
{if $show_band}
Modified: trunk/module/films/catalogue_video.tpl
===================================================================
--- trunk/module/films/catalogue_video.tpl 2007-05-20 22:42:20 UTC (rev 154)
+++ trunk/module/films/catalogue_video.tpl 2007-05-21 16:17:12 UTC (rev 155)
@@ -13,9 +13,9 @@
{/if}
{if $tri=="name" OR $tri=="date" OR $tri=="id"}
- <td width="100" height="130"><table border="0" cellpadding="0" cellspacing="0" width="100" height="120" bgcolor="{#COULEUR_FOND1#}"><tr height="80"><td width="100" height="80" valign="middle" align=center><img width="60" height="80" border="0" src="{$IMG2FBX}{$result[files].img|urlencode}&new_width=60&new_height=80&cache=1"></td></tr><tr height="50"><td width="100" height="50" valign="middle" align=center><a href="play.php?toplay={$result[files].dir|realpath|urlencode}" onfocus='real="R\xE9alisateur";avec="Avec";film="Film";dure="Dur\xE9e";genr="Genre";syno="Synopsis";synopsis="{$result[files].Synopsis|strip_delimiters|replace:"'":"`"|replace:"\"":"``"}";titre="{$result[files].name|strip_delimiters|replace:"'":"`"|replace:"\"":"``"} ({$result[files].sortie|date_format:"%d/%m/%Y"|strip_delimiters|replace:"'":"`"|replace:"\"":"``"})";realisateur="{$result[files].realisateur|strip_delimiters|replace:"'":"`"|replace:"\"":"``"}";acteurs="{$result[files].avec|strip_delimiters|replace:"'":"`"|replace:"\"":"``"}";nationalite="{$result[files].film|strip_delimiters|replace:"'":"`"|replace:"\"":"``"} ({$result[files].production})";genre="{$result[files].genre|strip_delimiters|replace:"'":"`"|replace:"\"":"``"}";duree="{$result[files].Duree|strip_delimiters|replace:"'":"`"|replace:"\"":"``"}";'><font size="1">{$result[files].name|truncate:12:'..':true}</font></a><br><font size="1">{if $result[files].sortie != 2}({$result[files].sortie|default:200|date_format:"%Y"}) - {/if}<a href="fichefilm.php?film={$result[files].name|urlencode}&fichier={$result[files].dir|realpath|urlencode}&start={$MIN}">Infos</a></font></td></tr></table></td>
+ <td width="100" height="130"><table border="0" cellpadding="0" cellspacing="0" width="100" height="120" bgcolor="{#COULEUR_FOND1#}"><tr height="80"><td width="100" height="80" valign="middle" align=center><img width="60" height="80" border="0" src="{$IMG2FBX}?img={$result[files].img|urlencode}&width=60&height=80&cache=1"></td></tr><tr height="50"><td width="100" height="50" valign="middle" align=center><a href="play.php?toplay={$result[files].dir|realpath|urlencode}" onfocus='real="R\xE9alisateur";avec="Avec";film="Film";dure="Dur\xE9e";genr="Genre";syno="Synopsis";synopsis="{$result[files].Synopsis|strip_delimiters|replace:"'":"`"|replace:"\"":"``"}";titre="{$result[files].name|strip_delimiters|replace:"'":"`"|replace:"\"":"``"} ({$result[files].sortie|date_format:"%d/%m/%Y"|strip_delimiters|replace:"'":"`"|replace:"\"":"``"})";realisateur="{$result[files].realisateur|strip_delimiters|replace:"'":"`"|replace:"\"":"``"}";acteurs="{$result[files].avec|strip_delimiters|replace:"'":"`"|replace:"\"":"``"}";nationalite="{$result[files].film|strip_delimiters|replace:"'":"`"|replace:"\"":"``"} ({$result[files].production})";genre="{$result[files].genre|strip_delimiters|replace:"'":"`"|replace:"\"":"``"}";duree="{$result[files].Duree|strip_delimiters|replace:"'":"`"|replace:"\"":"``"}";'><font size="1">{$result[files].name|truncate:12:'..':true}</font></a><br><font size="1">{if $result[files].sortie != 2}({$result[files].sortie|default:200|date_format:"%Y"}) - {/if}<a href="fichefilm.php?film={$result[files].name|urlencode}&fichier={$result[files].dir|realpath|urlencode}&start={$MIN}">Infos</a></font></td></tr></table></td>
{elseif $tri=="perso"}
- <td width="100" height="130"><a href="catalogue.php?tri=perso&start={$MIN}&sens={$sens}&suiv={$result[files].nom|urlencode}"><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="60" height="80" border="0" src="{$IMG2FBX}{$result[files].img|urlencode}&new_width=60&new_height=80&cache=1"></td></tr><tr height="50"><td width="100" height="50" valign="middle" align=center><font size="1">{$result[files].nom|wordwrap:18:"<br>":true}</font></td></tr></table></a></td>
+ <td width="100" height="130"><a href="catalogue.php?tri=perso&start={$MIN}&sens={$sens}&suiv={$result[files].nom|urlencode}"><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="60" height="80" border="0" src="{$IMG2FBX}?img={$result[files].img|urlencode}&width=60&height=80&cache=1"></td></tr><tr height="50"><td width="100" height="50" valign="middle" align=center><font size="1">{$result[files].nom|wordwrap:18:"<br>":true}</font></td></tr></table></a></td>
{/if}
{if $smarty.section.files.iteration is div by 5 AND NOT $smarty.section.files.last}
@@ -59,7 +59,7 @@
{elseif $tri=="perso_suiv"}
<table border="0" cellpadding="0" cellspacing="0" align="center">
- <tr><td width="120" height="160"><img src="{$IMG2FBX}{$info.img|urlencode}&cache=1"></td>
+ <tr><td width="120" height="160"><img src="{$IMG2FBX}?img={$info.img|urlencode}&cache=1"></td>
<td width="369">
<font size="4"><u>{$info.nom}</u></font>, {$info.statut}
{if $info.date_naissance!='2'}, <u>N\xE9 le</u> : {$info.date_naissance|date_format:"%e %B %Y"} \xE0 {$info.lieu_naissance}{/if}
@@ -74,7 +74,7 @@
<table border="0" cellpadding="0" cellspacing="0" width="500" align="center"><tr>
{/if}
- <td width="100" height="130"><table border="0" cellpadding="0" cellspacing="0" width="100" height="120" bgcolor="{#COULEUR_FOND1#}"><tr height="80"><td width="100" height="80" valign="middle" align=center><img width="60" height="80" border="0" src="{$IMG2FBX}{$result[films_with].img|urlencode}&new_width=60&new_height=80&cache=1"></td></tr><tr height="50"><td width="100" height="50" valign="middle" align=center><a href="play.php?toplay={$result[films_with].dir|realpath|urlencode}"><font size="1">{$result[films_with].name|truncate:12:'..':true}</font></a><br><font size="1">{if $result[films_with].sortie != 2}({$result[films_with].sortie|default:200|date_format:"%Y"}) - {/if}<a href="fichefilm.php?film={$result[films_with].name|urlencode}&fichier={$result[films_with].dir|realpath|urlencode}&start={$MIN}">Infos</a></font></td></tr></table></td>
+ <td width="100" height="130"><table border="0" cellpadding="0" cellspacing="0" width="100" height="120" bgcolor="{#COULEUR_FOND1#}"><tr height="80"><td width="100" height="80" valign="middle" align="center"><img width="60" height="80" border="0" src="{$IMG2FBX}?img={$result[films_with].img|urlencode}&width=60&height=80&cache=1"></td></tr><tr height="50"><td width="100" height="50" valign="middle" align=center><a href="play.php?toplay={$result[films_with].dir|realpath|urlencode}"><font size="1">{$result[films_with].name|truncate:12:'..':true}</font></a><br><font size="1">{if $result[films_with].sortie != 2}({$result[films_with].sortie|default:200|date_format:"%Y"}) - {/if}<a href="fichefilm.php?film={$result[films_with].name|urlencode}&fichier={$result[films_with].dir|realpath|urlencode}&start={$MIN}">Infos</a></font></td></tr></table></td>
{if $smarty.section.films_with.last}
@@ -121,7 +121,7 @@
{/if}
{/if}
- <td width="100" height="130"><table border="0" cellpadding="0" cellspacing="0" width="100" height="120" bgcolor="{#COULEUR_FOND1#}"><tr height="80"><td width="100" height="80" valign="middle" align=center><img width="60" height="80" border="0" src="{$IMG2FBX}{$result[files].img|urlencode}&new_width=60&new_height=80&cache=1"></td></tr><tr height="50"><td width="100" height="50" valign="middle" align=center><a href="play.php?toplay={$result[files].dir|realpath|urlencode}" onfocus='real="R\xE9alisateur";avec="Avec";film="Film";dure="Dur\xE9e";genr="Genre";syno="Synopsis";synopsis="{$result[files].Synopsis|strip_delimiters|replace:"'":"`"|replace:"\"":"``"}";titre="{$result[files].name|strip_delimiters|replace:"'":"`"|replace:"\"":"``"} ({$result[files].sortie|date_format:"%d/%m/%Y"|strip_delimiters|replace:"'":"`"|replace:"\"":"``"})";realisateur="{$result[files].realisateur|strip_delimiters|replace:"'":"`"|replace:"\"":"``"}";acteurs="{$result[files].avec|strip_delimiters|replace:"'":"`"|replace:"\"":"``"}";nationalite="{$result[files].film|strip_delimiters|replace:"'":"`"|replace:"\"":"``"} ({$result[files].production})";genre="{$result[files].genre|strip_delimiters|replace:"'":"`"|replace:"\"":"``"}";duree="{$result[files].Duree|strip_delimiters|replace:"'":"`"|replace:"\"":"``"}";'><font size="1">{$result[files].name|truncate:12:'..':true}</font></a><br><font size="1">{if $result[files].sortie != 2}({$result[files].sortie|default:200|date_format:"%Y"}) - {/if}<a href="fichefilm.php?film={$result[files].name|urlencode}&fichier={$result[files].dir|realpath|urlencode}&start={$MIN}">Infos</a></font></td></tr></table></td>
+ <td width="100" height="130"><table border="0" cellpadding="0" cellspacing="0" width="100" height="120" bgcolor="{#COULEUR_FOND1#}"><tr height="80"><td width="100" height="80" valign="middle" align="center"><img width="60" height="80" border="0" src="{$IMG2FBX}?img={$result[files].img|urlencode}&width=60&height=80&cache=1"></td></tr><tr height="50"><td width="100" height="50" valign="middle" align=center><a href="play.php?toplay={$result[files].dir|realpath|urlencode}" onfocus='real="R\xE9alisateur";avec="Avec";film="Film";dure="Dur\xE9e";genr="Genre";syno="Synopsis";synopsis="{$result[files].Synopsis|strip_delimiters|replace:"'":"`"|replace:"\"":"``"}";titre="{$result[files].name|strip_delimiters|replace:"'":"`"|replace:"\"":"``"} ({$result[files].sortie|date_format:"%d/%m/%Y"|strip_delimiters|replace:"'":"`"|replace:"\"":"``"})";realisateur="{$result[files].realisateur|strip_delimiters|replace:"'":"`"|replace:"\"":"``"}";acteurs="{$result[files].avec|strip_delimiters|replace:"'":"`"|replace:"\"":"``"}";nationalite="{$result[files].film|strip_delimiters|replace:"'":"`"|replace:"\"":"``"} ({$result[files].production})";genre="{$result[files].genre|strip_delimiters|replace:"'":"`"|replace:"\"":"``"}";duree="{$result[files].Duree|strip_delimiters|replace:"'":"`"|replace:"\"":"``"}";'><font size="1">{$result[files].name|truncate:12:'..':true}</font></a><br><font size="1">{if $result[files].sortie != 2}({$result[files].sortie|default:200|date_format:"%Y"}) - {/if}<a href="fichefilm.php?film={$result[files].name|urlencode}&fichier={$result[files].dir|realpath|urlencode}&start={$MIN}">Infos</a></font></td></tr></table></td>
{if $smarty.section.files.iteration is div by 5 AND NOT $smarty.section.files.last}
</tr><tr>
Modified: trunk/module/films/fichefilm.php
===================================================================
--- trunk/module/films/fichefilm.php 2007-05-20 22:42:20 UTC (rev 154)
+++ trunk/module/films/fichefilm.php 2007-05-21 16:17:12 UTC (rev 155)
@@ -136,7 +136,7 @@
$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_FOND_AVERTISSEMENT'].'" 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>';
+ $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_FOND_AVERTISSEMENT'].'" abgcolor="'.$_COULEUR['COULEUR_TABLE_SELECTED'].'"><tr height="65"><td width="80" height="65" valign="middle" align="center"><img src="'.$IMG2FBX.'?local=1&width=75&height=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>';
}
Modified: trunk/module/films/fichefilm.tpl
===================================================================
--- trunk/module/films/fichefilm.tpl 2007-05-20 22:42:20 UTC (rev 154)
+++ trunk/module/films/fichefilm.tpl 2007-05-21 16:17:12 UTC (rev 155)
@@ -1,6 +1,6 @@
{if isset($info) AND $info != 'Aucun film trouv\xE9'}
<table cellspacing=0 align="center">
- <tr><td width="120" height="160"><img src="{$IMG2FBX}{$info.image|urlencode}&cache=1"></td>
+ <tr><td width="120" height="160"><img src="{$IMG2FBX}?img={$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}{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"}
@@ -18,10 +18,10 @@
{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>
+ <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="{$IMG2FBX}?local=1&width=75&height=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>
+ <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="{$IMG2FBX}?local=1&width=75&height=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}
Modified: trunk/module/films/lecture.php
===================================================================
--- trunk/module/films/lecture.php 2007-05-20 22:42:20 UTC (rev 154)
+++ trunk/module/films/lecture.php 2007-05-21 16:17:12 UTC (rev 155)
@@ -4,9 +4,25 @@
$BACKGROUND = 'none';
$cansetfrontpannel = true;
-
+$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';
+
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);
+ set_refresh($VLC['duree_restante'], $VLC['duree_restante'].';url=lecture.php?control=stop&signet=noload&theend=1');
}
$META['front_panel'] = strtoupper($VLC['etat']);
@@ -212,31 +228,12 @@
}
}
-$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';
-
-
-
if(isset($message)){
$smarty->assign('AVERTISSEMENT',$message);
$smarty->display('avertissement.tpl');
}else{
if(trim($OSD)==''){
- if($cansetfrontpannel and $VLC['etat']=='playing'){
+ if($cansetfrontpannel and $VLC['etat']=='playing'){
if($vers_fbx>4 AND $VLC['duree_totale']>=5){
set_refresh(2, '2;url=lecture.php');
}
Modified: trunk/module/films/play.php
===================================================================
--- trunk/module/films/play.php 2007-05-20 22:42:20 UTC (rev 154)
+++ trunk/module/films/play.php 2007-05-21 16:17:12 UTC (rev 155)
@@ -122,8 +122,6 @@
$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';
Modified: trunk/module/guidetv/guidetv.tpl
===================================================================
--- trunk/module/guidetv/guidetv.tpl 2007-05-20 22:42:20 UTC (rev 154)
+++ trunk/module/guidetv/guidetv.tpl 2007-05-21 16:17:12 UTC (rev 155)
@@ -1,7 +1,7 @@
{if isset($EMISSION)}
<table border="0" cellpadding="2" cellspacing="0">
<tr><td colspan="2">De {$EMISSION.debut|date_format:"%H:%M"} \xE0 {$EMISSION.fin|date_format:"%H:%M"}, le {$EMISSION.debut|date_format:"%A %e %B %Y"} sur {$chaine.nom}</td></tr>
- <tr><td>{if $EMISSION.icone!='http://static.digitalmondadori.fr/gtv/visu'}<img src="{$IMG2FBX}{$EMISSION.icone|urlencode}&cache=1">{else}<img src="{$INTERFACE_REP}noimage.gif">{/if}</td>
+ <tr><td>{if $EMISSION.icone!='http://static.digitalmondadori.fr/gtv/visu'}<img src="{$IMG2FBX}?img={$EMISSION.icone|urlencode}&cache=1">{else}<img src="{$INTERFACE_REP}noimage.gif">{/if}</td>
<td width="369">
<font size="4">{$EMISSION.titre}</font>{if $EMISSION.note!=''} <img src="{$INTERFACE_REP}star{$EMISSION.note}.gif">{/if}<br>
{if $info_chaine.id!='inc'}
Modified: trunk/module/modules/modules.tpl
===================================================================
--- trunk/module/modules/modules.tpl 2007-05-20 22:42:20 UTC (rev 154)
+++ trunk/module/modules/modules.tpl 2007-05-21 16:17:12 UTC (rev 155)
@@ -6,7 +6,7 @@
{/if}
<tr>
- <td align="left" valign="top" width="130"><img width="120" height="90" src="{$IMG2FBX}{$MOD[mod].img|realpath|urlencode}&new_width=120&new_height=90&cache=1"></td>
+ <td align="left" valign="top" width="130"><img width="120" height="90" src="{$IMG2FBX}?img={$MOD[mod].img|realpath|urlencode}&width=120&height=90&cache=1"></td>
<td align="left" valign="top" width="330"><b><u>{$MOD[mod].nom}{if $action=="skin" AND $MOD[mod].current} - Skin actif{/if}</u></b><br>
<b>Version</b> : {$MOD[mod].version}<br>
<b>Description</b> : {$MOD[mod].description}</td>
@@ -33,7 +33,7 @@
{/if}
<tr>
- <td align="left" valign="top" width="120"><img width="120" height="90" src="{$IMG2FBX}{$MOD[mod].img|urlencode}&new_width=120&new_height=90&cache=1"></td>
+ <td align="left" valign="top" width="120"><img width="120" height="90" src="{$IMG2FBX}?img={$MOD[mod].img|urlencode}&width=120&height=90&cache=1"></td>
<td align="left" valign="top" width="360"><b><u>{$MOD[mod].nom}</u></b><br>
<b>Version</b> : {$MOD[mod].version}<br>
<b>Description</b> : {$MOD[mod].description}</td>
Modified: trunk/module/mp3/playlist_audio.tpl
===================================================================
--- trunk/module/mp3/playlist_audio.tpl 2007-05-20 22:42:20 UTC (rev 154)
+++ trunk/module/mp3/playlist_audio.tpl 2007-05-21 16:17:12 UTC (rev 155)
@@ -9,7 +9,7 @@
Auteur : {$info.auteur_flux|strip_tags}<br>
Description : {$info.description|strip_tags}<br>
- <img src="{$IMG2FBX}{$info.image}&cache=1&new_width=150&new_height=150" border="0" width="150" height="150"><br> <br>
+ <img src="{$IMG2FBX}?img={$info.image}&cache=1&width=150&height=150" border="0" width="150" height="150"><br> <br>
<center><u>En cours d'\xE9coute</u></center><br>
Modified: trunk/module/recettes/recettes2.tpl
===================================================================
--- trunk/module/recettes/recettes2.tpl 2007-05-20 22:42:20 UTC (rev 154)
+++ trunk/module/recettes/recettes2.tpl 2007-05-21 16:17:12 UTC (rev 155)
@@ -114,7 +114,7 @@
</tr>
</table>
{else}
-<img src="{$IMG2FBX}{$urlimg}" border="0" alt="" width="512" height="384">
+<img src="{$IMG2FBX}?img={$urlimg}&cache=1&width=512&height=384" border="0" alt="" width="512" height="384">
{/if}
Modified: trunk/module/rss/rss.tpl
===================================================================
--- trunk/module/rss/rss.tpl 2007-05-20 22:42:20 UTC (rev 154)
+++ trunk/module/rss/rss.tpl 2007-05-21 16:17:12 UTC (rev 155)
@@ -12,7 +12,7 @@
<tr><td><a href="index1.php?cat={$cat}&feed={$RSS[liste].id}">
<table width="500" border="0" cellpadding="0" cellspacing="0" bgcolor="{#COULEUR_FOND1#}" abgcolor="{#COULEUR_TABLE_SELECTED#}">
<tr>
- <td align="left" valign="top" width="120"><img width="120" height="90" src="{$IMG2FBX}{$RSS[liste].img|urlencode}&new_width=120&new_height=90&cache=1"></td>
+ <td align="left" valign="top" width="120"><img width="120" height="90" src="{$IMG2FBX}?img={$RSS[liste].img|urlencode}&width=120&height=90&cache=1"></td>
<td align="left" valign="top" width="380"><b><u>{$RSS[liste].name|truncate:30}</u></b><br>{$RSS[liste].description|truncate:100}</td>
</tr>
</table>
Modified: trunk/module/seances/programme_cine.tpl
===================================================================
--- trunk/module/seances/programme_cine.tpl 2007-05-20 22:42:20 UTC (rev 154)
+++ trunk/module/seances/programme_cine.tpl 2007-05-21 16:17:12 UTC (rev 155)
@@ -6,7 +6,7 @@
{/if}
{section name=FILMS loop=$FILMS max=3 start=$MIN}
- <table border="0" cellpadding="0" cellspacing="0" width="500"><tr><td width="100" height="120" valign="middle" align="center"><img width="90" height="120" border="0" src="{$IMG2FBX}{$FILMS[FILMS].2|urlencode}&new_width=90&new_height=120&cache=1"></td>
+ <table border="0" cellpadding="0" cellspacing="0" width="500"><tr><td width="100" height="120" valign="middle" align="center"><img width="90" height="120" border="0" src="{$IMG2FBX}?img={$FILMS[FILMS].2|urlencode}&width=90&height=120&cache=1"></td>
<td width="400"><a href={$MODULE}films/fichefilm.php?togo=cine&salle={$s}&film={$FILMS[FILMS].0|urlencode}&filmid={$FILMS[FILMS].6}><u>{$FILMS[FILMS].0}</u></a> - {$FILMS[FILMS].3}<br>
<u>Notes</u> : Presse <img src="{$INTERFACE_REP}star{$FILMS[FILMS].5}.gif"> Spectateurs <img src="{$INTERFACE_REP}star{$FILMS[FILMS].4}.gif"><br>
{section name=seance loop=$FILMS[FILMS].1}
Modified: trunk/module/stage6/stage6.tpl
===================================================================
--- trunk/module/stage6/stage6.tpl 2007-05-20 22:42:20 UTC (rev 154)
+++ trunk/module/stage6/stage6.tpl 2007-05-21 16:17:12 UTC (rev 155)
@@ -8,7 +8,7 @@
{/if}
{/if}
- <td width="100" height="150"><a href="play_stage6.php?url={$CLIP[clip].url|urlencode}&show={$SHOW}&min={$MIN}&string={$string}&duree={$CLIP[clip].duree}"><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="45" border="0" src="{$IMG2FBX}{$CLIP[clip].img|urlencode}&new_width=80&new_height=45&cache=1"></td></tr><tr height="70"><td width="100" height="70" valign="mid...
[truncated message content] |
|
From: <ara...@us...> - 2007-05-22 19:34:52
|
Revision: 156
http://svn.sourceforge.net/easybox-mod/?rev=156&view=rev
Author: aragornis
Date: 2007-05-22 12:34:43 -0700 (Tue, 22 May 2007)
Log Message:
-----------
Diverses changement pour finir la v4.1.0 et la skin mediacenter
Modified Paths:
--------------
trunk/_framework/demarrage.php
trunk/_framework/framework.php
trunk/_framework/lib/lib_photo.php
trunk/_utilisateur/modules.db
trunk/http-vlc/lecteur/set_option.html
trunk/module/_explorateur/explorateur.tpl
trunk/module/cinefil/sorties_cine.tpl
trunk/module/clips/play_clip.php
trunk/module/diaporama/explorateur_photo.tpl
trunk/module/diaporama/index1.php
trunk/module/favoris/favoris.tpl
trunk/module/favoris/index1.php
trunk/module/films/films.tpl
trunk/module/films/lecture.php
trunk/module/films/signet_film.tpl
trunk/module/mp3/audio.tpl
trunk/module/signet/playsignet.php
trunk/module/stage6/index1.php
trunk/module/stage6/play_stage6.php
trunk/skin/mediacenter/audio.tpl
trunk/skin/mediacenter/framework_skin.php
trunk/skin/mediacenter/interface.tpl
trunk/skin/mediacenter/menu.tpl
trunk/skin/simple/framework_skin.php
trunk/skin/simplegreen/framework_skin.php
Added Paths:
-----------
trunk/module/telesite/
trunk/module/telesite/index.php
trunk/skin/mediacenter/interface/pagination.gif
Modified: trunk/_framework/demarrage.php
===================================================================
--- trunk/_framework/demarrage.php 2007-05-21 16:17:12 UTC (rev 155)
+++ trunk/_framework/demarrage.php 2007-05-22 19:34:43 UTC (rev 156)
@@ -28,9 +28,12 @@
$etape = $_GET['etape'];
}
+ if(eregi("stop",$contenu_html) and $etape==1){
+ $FORCED = true;
+ }
+
if($vers_fbx<=4){
$META['service'] = 'ts://127.0.0.1?pcr=68&aud=69(en,mp2)&vid=68';
- //$META['display_aspect_ratio_conversion'] = 'letterbox';
}
//-- Chargement des donn\xE9es de configuration
Modified: trunk/_framework/framework.php
===================================================================
--- trunk/_framework/framework.php 2007-05-21 16:17:12 UTC (rev 155)
+++ trunk/_framework/framework.php 2007-05-22 19:34:43 UTC (rev 156)
@@ -20,7 +20,8 @@
//--Chargement de Smarty
require_once($LIBRARIES_REP.'/Smarty.class.php');
$smarty = new Smarty();
-
+
+ $smarty->assign('vers_fbx',$vers_fbx);
$smarty->assign('FRAMEWORK_REP',$FRAMEWORK_REP);
$smarty->assign('RACINE_REP',$RACINE_REP);
$smarty->assign('LIBRARIES_REP',$LIBRARIES_REP);
Modified: trunk/_framework/lib/lib_photo.php
===================================================================
--- trunk/_framework/lib/lib_photo.php 2007-05-21 16:17:12 UTC (rev 155)
+++ trunk/_framework/lib/lib_photo.php 2007-05-22 19:34:43 UTC (rev 156)
@@ -131,7 +131,7 @@
$this->tourner();
// Redimensionner
- if($this->width!=0 AND $this->height!=0){
+ if($this->r_width!=0 AND $this->r_height!=0){
$this->redimensionner();
}
@@ -167,18 +167,20 @@
function redimensionner(){
$pourcent = min(min(($this->r_width/$this->width),1),min(($this->r_height/$this->height),1));
- $redimx = floor($this->width*$pourcent);
- $redimy = floor($this->height*$pourcent);
- $image1 = imagecreatetruecolor($redimx, $redimy);
-
- if($this->quality=='max'){
- ImageCopyresampled($image1,$this->img,0,0,0,0,$redimx,$redimy,$this->width,$this->height);
- }else{
- ImageCopyresized($image1,$this->img,0,0,0,0,$redimx,$redimy,$this->width,$this->height);
+ if($pourcent<1){
+ $redimx = floor($this->width*$pourcent);
+ $redimy = floor($this->height*$pourcent);
+ $image1 = imagecreatetruecolor($redimx, $redimy);
+
+ if($this->quality=='max'){
+ ImageCopyresampled($image1,$this->img,0,0,0,0,$redimx,$redimy,$this->width,$this->height);
+ }else{
+ ImageCopyresized($image1,$this->img,0,0,0,0,$redimx,$redimy,$this->width,$this->height);
+ }
+ $this->img = $image1;
+ $this->width = $redimx;
+ $this->height = $redimy;
}
- $this->img = $image1;
- $this->width = $redimx;
- $this->height = $redimy;
}
function tourner(){
Modified: trunk/_utilisateur/modules.db
===================================================================
(Binary files differ)
Modified: trunk/http-vlc/lecteur/set_option.html
===================================================================
--- trunk/http-vlc/lecteur/set_option.html 2007-05-21 16:17:12 UTC (rev 155)
+++ trunk/http-vlc/lecteur/set_option.html 2007-05-22 19:34:43 UTC (rev 156)
@@ -1,5 +1,6 @@
<!-- 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="'-1' 'clock-synchro' 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-21 16:17:12 UTC (rev 155)
+++ trunk/module/_explorateur/explorateur.tpl 2007-05-22 19:34:43 UTC (rev 156)
@@ -141,6 +141,8 @@
</td></tr>
{/if}
+{sectionelse}
+ <td><font size="1">Aucun fichier dans ce dossier</font></td>
{/section}
<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>
Modified: trunk/module/cinefil/sorties_cine.tpl
===================================================================
--- trunk/module/cinefil/sorties_cine.tpl 2007-05-21 16:17:12 UTC (rev 155)
+++ trunk/module/cinefil/sorties_cine.tpl 2007-05-22 19:34:43 UTC (rev 156)
@@ -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 !$_multipage.is_first_page}{precedent}{/if}
+ {if !$_multipage.is_first_page}{precedent}<br>{/if}
<table border="0" cellpadding="0" cellspacing="0" width="500" height="360" align="center"><tr>
{/if}
Modified: trunk/module/clips/play_clip.php
===================================================================
--- trunk/module/clips/play_clip.php 2007-05-21 16:17:12 UTC (rev 155)
+++ trunk/module/clips/play_clip.php 2007-05-22 19:34:43 UTC (rev 156)
@@ -22,8 +22,7 @@
$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','http://video.stage6.com/1198169/.divx',0,'backToURL');
+ play_fichier('type=40',$url,0,'backToURL');
$LINK['stop']=$MODULE.'films/lecture.php?control=stop';
$LINK['play']=$MODULE.'films/lecture.php?control=play';
Modified: trunk/module/diaporama/explorateur_photo.tpl
===================================================================
--- trunk/module/diaporama/explorateur_photo.tpl 2007-05-21 16:17:12 UTC (rev 155)
+++ trunk/module/diaporama/explorateur_photo.tpl 2007-05-22 19:34:43 UTC (rev 156)
@@ -27,23 +27,21 @@
{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>
+ <td colspan="5" align=center>{precedent}<font size="1"> - <a href="index1.php?start=0&rep={$rep_encoded}">D\xE9but du r\xE9pertoire</a></font></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>
+ <td width="100" height="110"><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="110" bgcolor="{#COULEUR_FOND1#}" abgcolor="{#COULEUR_TABLE_SELECTED#}"><tr height="70"><td width="100" height="70" valign="middle" align="center"><img border=0 width="64" height="64" src="lecteur.gif"></td></tr><tr height="50"><td width="100" height="40" 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>
+ <td width="100" height="110"><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="110" bgcolor="{#COULEUR_FOND1#}" abgcolor="{#COULEUR_TABLE_SELECTED#}"><tr height="70"><td width="100" height="70" valign="middle" align="center"><img border=0 width="64" height="64" src="big_dossier.gif"></td></tr><tr height="50"><td width="100" height="40" 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="{$IMG2FBX}?local=1&width=88&height=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>
+ <td width="100" height="110" 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="110" bgcolor="{#COULEUR_FOND1#}" abgcolor="{#COULEUR_TABLE_SELECTED#}"><tr height="70"><td width="100" height="70" valign="middle" align="center" background="fond_cell.gif"><img width="{$newdim.0}" height="{$newdim.1}" border="0" src="{$IMG2FBX}?local=1&width=88&height=68&img={$REP|cat:'/'|cat:$files[files]|urlencode}"></td></tr><tr height="40"><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}
@@ -68,7 +66,7 @@
{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>
+ <tr><td colspan="5" align="center" height="25" valign=bottom>{suivant}<font size="1"> - <a href="index1.php?start={$rows-$NUM_ROW_AFFICH}&rep={$rep_encoded}">Fin du r\xE9pertoire</a> - </font>{pagination}</td></tr>
{/if}
</table>
Modified: trunk/module/diaporama/index1.php
===================================================================
--- trunk/module/diaporama/index1.php 2007-05-21 16:17:12 UTC (rev 155)
+++ trunk/module/diaporama/index1.php 2007-05-22 19:34:43 UTC (rev 156)
@@ -9,7 +9,7 @@
$ext_ok = explode(",",$extension);
$ext = $ext_ok;
-if (isset($_GET['show_band'])) {
+if (isset($_GET['show_band'])){
$show_band = $_GET['show_band'];
}else{
$show_band = get_variable('lastshowinfo');
@@ -26,12 +26,6 @@
$show_band = true;
}
-if (isset($_GET['start'])) {
- $min = max($_GET['start'],0);
-}else{
- $min = 0;
-}
-
if (isset($_GET['tourne'])) {
$tourne = $_GET['tourne'];
}else{
@@ -39,17 +33,6 @@
}
$smarty->assign('tourne',$tourne);
-//Si on a demand\xE9 \xE0 se placer autour d'une certaine photo, on y va !
-if (isset($_GET['tosee'])) {
-$i=0;
- while($i+15<$_GET['tosee']){
- $i=$i+15;
- }
-$min = $i;
-}
-
-$smarty->assign('MIN',$min);
-
//Fonctions essentielles
function estcachelinux($fichier){
global $afficher_fichier_cache, $hiddenfiles;
@@ -158,11 +141,23 @@
$nn_files = count($files);
}
}elseif($_GET['dos']=='disks'){
-$smarty->assign('DOS',True);
-$files = unserialize(get_variable('disques'));
-$T_repertoire = $files;
+ $smarty->assign('DOS',True);
+ $files = unserialize(get_variable('disques'));
+ $T_repertoire = $files;
}
+// Lancement de la gestion multipage
+start_multi('index1.php?rep='.urlencode($rep),15,count($files));
+
+//Si on a demand\xE9 \xE0 se placer autour d'une certaine photo, on y va !
+if (isset($_GET['tosee'])) {
+$i=0;
+ while($i+15<$_GET['tosee']){
+ $i+=15;
+ }
+$min = $i;
+}
+
$path=PATH();
$smarty->assign('CHEMIN_REP',$path);
$smarty->assign('Nb_rep_path',count($path));
@@ -175,15 +170,13 @@
$aff=$_GET['image'];
}
-if (isset($_GET['delais']) AND $aff+1 < count($files)) {
- $delais = $_GET['delais'];
-} elseif (isset($_GET['delais']) AND ($aff+1 == count($files)))
- {
- $message = 'Redirection vers les photos ...';
- set_refresh(2,'2;url='.page_retour_film(),true);
- }
-else{
- $delais = 0;
+if (isset($_GET['delais']) AND $aff+1 < count($files)){
+ $delais = $_GET['delais'];
+}elseif (isset($_GET['delais']) AND ($aff+1 == count($files))){
+ $message = 'Redirection vers les photos ...';
+ set_refresh(2,'2;url='.page_retour_film(),true);
+}else{
+ $delais = 0;
}
//Ajout dans la base de donn\xE9e pour les retours
@@ -193,82 +186,79 @@
if(isset($aff)){
-
-if ($_GET['start_play']=='oui') {
- save_variable('playing_audio', 'oui');
+ if ($_GET['start_play']=='oui') {
+ save_variable('playing_audio', 'oui');
+
+ if($pisteaudio=='TV'){
+ $play = 'type=1';
+ }elseif($pisteaudio=='PC'){
+ $play = 'type=3';
+ $decallage = $ini['multimedia']['compensation'];
+ $file2 = @readfile('http://127.0.0.1:8081/lecteur/modif-config.html?type=0&var=audio-desync&value='.$decallage);
+ }elseif($pisteaudio=='AC3'){
+ // $META['aud'] = '69(en,ac3)';
+ $play = 'type=5';
+ }
- if($pisteaudio=='TV'){
- $play = 'type=1';
- }elseif($pisteaudio=='PC'){
- $play = 'type=3';
- $decallage = $ini['multimedia']['compensation'];
- $file2 = @readfile('http://127.0.0.1:8081/lecteur/modif-config.html?type=0&var=audio-desync&value='.$decallage);
- }elseif($pisteaudio=='AC3'){
- // $META['aud'] = '69(en,ac3)';
- $play = 'type=5';
+ $db = sqlite_open($USER.'audio.db', 0666);
+ $query = 'SELECT max(id) FROM music';
+ $result=sqlite_query($db, $query);
+ $row = sqlite_fetch_array($result);
+ $rand = rand(1,$row[0]-26);
+ $query = 'SELECT * FROM music WHERE ((id<="'.($rand+50).'") and (id>="'.$rand.'")) limit 25';
+ $result=sqlite_query($db, $query);
+
+ $variable = '';
+ while ($row = sqlite_fetch_array($result)) {
+ $basename = $row[filename];
+ $variable .= "
+ ".utf8_encode(realpath($basename));
+ }
+
+ $fp = fopen($AUDIOTEMP.'audiotemp'.get_variable('num_playlist').'.m3u',"w+");
+ fputs($fp,"#EXTM3U");
+ fputs($fp,$variable);
+ fclose($fp);
+ play_fichier('type=1',realpath($AUDIOTEMP.'audiotemp'.get_variable('num_playlist').'.m3u'),1,'mp3');
+ $BACKGROUND = 'none';
+ save_variable('num_playlist', get_variable('num_playlist')+1);
+ }elseif($_GET['start_play']=='non'){
+ $file1 = file_get_contents("http://127.0.0.1:8081/lecteur/action.html?control=stop");
+ save_variable('playing_audio', 'non');
}
-
- $db = sqlite_open($USER.'audio.db', 0666);
- $query = 'SELECT max(id) FROM music';
- $result=sqlite_query($db, $query);
- $row = sqlite_fetch_array($result);
- $rand = rand(1,$row[0]-26);
- $query = 'SELECT * FROM music WHERE ((id<="'.($rand+50).'") and (id>="'.$rand.'")) limit 25';
- $result=sqlite_query($db, $query);
-
- $variable = '';
- while ($row = sqlite_fetch_array($result)) {
- $basename = $row[filename];
- $variable .= "
- ".utf8_encode(realpath($basename));
+
+ if(get_variable('playing_audio')=='oui'){
+ $smarty->assign('start_play','non');
+ }else{
+ $smarty->assign('start_play','oui');
}
-
- $fp = fopen($AUDIOTEMP.'audiotemp'.get_variable('num_playlist').'.m3u',"w+");
- fputs($fp,"#EXTM3U");
- fputs($fp,$variable);
- fclose($fp);
- play_fichier('type=1',realpath($AUDIOTEMP.'audiotemp'.get_variable('num_playlist').'.m3u'),1,'mp3');
- $BACKGROUND = 'none';
- save_variable('num_playlist', get_variable('num_playlist')+1);
-}elseif($_GET['start_play']=='non'){
- $file1 = file_get_contents("http://127.0.0.1:8081/lecteur/action.html?control=stop");
- save_variable('playing_audio', 'non');
-}
+
+ if($delais){
+ $LINK['stop']='index1.php?start='.$min.'&rep='.urlencode($rep).'&image='.$aff.'&delais=0&tourne='.$tourne;
+ $LINK['pause']='index1.php?start='.$min.'&rep='.urlencode($rep).'&image='.$aff.'&delais=0&tourne='.$tourne;
+ $META['refresh']= $delais.';url=index1.php?start='.$min.'&rep='.urlencode($rep).'&image='.($aff+1).'&delais='.$delais.'&tourne='.$tourne;
+ }else{
+ $LINK['play']='index1.php?start='.$min.'&rep='.urlencode($rep).'&image='.$aff.'&delais=5&tourne='.$tourne;
+ }
+
+ if($show_band){
+ $LINK['info']='index1.php?start='.$min.'&rep='.urlencode($rep).'&image='.$aff.'&delais='.$delais.'&tourne='.$tourne.'&show_band=non';
+ }else{
+ $LINK['info']='index1.php?start='.$min.'&rep='.urlencode($rep).'&image='.$aff.'&delais='.$delais.'&tourne='.$tourne.'&show_band=oui';
+ }
+
+ $smarty->assign('show_band',$show_band);
+ $smarty->assign('delais',$delais);
+ $smarty->assign('aff',$aff);
+ $smarty->display('photo.tpl');
-if(get_variable('playing_audio')=='oui'){
- $smarty->assign('start_play','non');
-}else{
- $smarty->assign('start_play','oui');
-}
-
-if($delais){
-$LINK['stop']='index1.php?start='.$min.'&rep='.urlencode($rep).'&image='.$aff.'&delais=0&tourne='.$tourne;
-$LINK['pause']='index1.php?start='.$min.'&rep='.urlencode($rep).'&image='.$aff.'&delais=0&tourne='.$tourne;
-$META['refresh']= $delais.';url=index1.php?start='.$min.'&rep='.urlencode($rep).'&image='.($aff+1).'&delais='.$delais.'&tourne='.$tourne;
-}else{
-$LINK['play']='index1.php?start='.$min.'&rep='.urlencode($rep).'&image='.$aff.'&delais=5&tourne='.$tourne;
-}
-
-if($show_band){
- $LINK['info']='index1.php?start='.$min.'&rep='.urlencode($rep).'&image='.$aff.'&delais='.$delais.'&tourne='.$tourne.'&show_band=non';
-}else{
- $LINK['info']='index1.php?start='.$min.'&rep='.urlencode($rep).'&image='.$aff.'&delais='.$delais.'&tourne='.$tourne.'&show_band=oui';
-}
-
-$smarty->assign('show_band',$show_band);
-$smarty->assign('delais',$delais);
-$smarty->assign('aff',$aff);
-$smarty->display('photo.tpl');
-
-}elseif(isset($message))
-{
+}elseif(isset($message)){
$smarty->assign('AVERTISSEMENT',$message);
$smarty->display('avertissement.tpl');
-} else
-{
-$LINK['red']= $MODULE.'_menu/menu.php';
-$smarty->assign('CONTENT',$smarty->fetch('explorateur_photo.tpl'));
-$smarty->display('interface.tpl');
+}else{
+ $LINK['red']= $MODULE.'_menu/menu.php';
+ $smarty->assign('CONTENT',$smarty->fetch('explorateur_photo.tpl'));
+ $smarty->display('interface.tpl');
}
?>
Modified: trunk/module/favoris/favoris.tpl
===================================================================
--- trunk/module/favoris/favoris.tpl 2007-05-21 16:17:12 UTC (rev 155)
+++ trunk/module/favoris/favoris.tpl 2007-05-22 19:34:43 UTC (rev 156)
@@ -1,6 +1,6 @@
<a href="index1.php?action=explorateur">Ajouter un favori \xE0 la liste</a><br> <br>
-{section name=table loop=$CONTENT_TABLE}
+{section name=table loop=$CONTENT_TABLE start=$MIN max=15}
{if $smarty.section.table.first}
<table width="450" border="0" cellpadding="0" cellspacing="0">
{/if}
Modified: trunk/module/favoris/index1.php
===================================================================
--- trunk/module/favoris/index1.php 2007-05-21 16:17:12 UTC (rev 155)
+++ trunk/module/favoris/index1.php 2007-05-22 19:34:43 UTC (rev 156)
@@ -27,7 +27,8 @@
$icone_fichier = "noname.gif";
$extension = ".riendutous";
$afficher_fichier_cache = $ini['explorateur']['afficher_fichier_cache'];
- $smarty->assign('TITRE','Favoris');
+ $LINK['red']= $MODULE.'favoris/index1.php';
+ $smarty->assign('TITRE','Favoris - Cliquez sur l\'\xE9toile pour ajouter ce dossier.');
include($EXPLORATEUR);
}elseif($_GET['action'] == 'suppr') {
@@ -59,6 +60,10 @@
$query = "SELECT * FROM favoris";
$result=sqlite_query($db, $query);
+ // Lancement de la gestion multipage
+ start_multi('index1.php?a=1',15,sqlite_num_rows($result));
+
+
$smarty->assign('TITRE','Favoris');
$smarty->assign('CONTENT_TABLE',sqlite_fetch_all($result));
Modified: trunk/module/films/films.tpl
===================================================================
--- trunk/module/films/films.tpl 2007-05-21 16:17:12 UTC (rev 155)
+++ trunk/module/films/films.tpl 2007-05-22 19:34:43 UTC (rev 156)
@@ -49,24 +49,34 @@
Augmenter la qualit\xE9 du traitement de l'image (de 0 vers 6) demande plus de puissance CPU.
<br>
+<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>
+<tr><td width="90">Couleur</td><td width="5">:</td><td><input bgcolor="{#COULEUR_FOND_RADIO#}" type=hslider name=denc_saturation min=0 max=255 grad=16></td></tr>
+<tr><td width="90">Zoom</td><td width="5">:</td><td><input bgcolor="{#COULEUR_FOND_RADIO#}" type=hslider name=video_output_scale min=25 max=175 grad=5> - <a href="none" onSelect='video_output_scale="100";'>R\xE9initialiser</a></td></tr>
+</table>
+
+{if $vers_fbx==5}
<select name=display_scaling>
<option value=letterbox>Letterbox
<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>
-<tr><td width="90">Couleur</td><td width="5">:</td><td><input bgcolor="{#COULEUR_FOND_RADIO#}" type=hslider name=denc_saturation min=0 max=255 grad=16></td></tr>
-<tr><td width="90">Zoom</td><td width="5">:</td><td><input bgcolor="{#COULEUR_FOND_RADIO#}" type=hslider name=video_output_scale min=25 max=175 grad=5> - <a href="none" onSelect='video_output_scale="100";'>R\xE9initialiser</a></td></tr>
+{else}
+<table width="250" align="left">
+<tr><td width="130">4/3 Letterbox</td><td><input type=radio bgcolor="{#COULEUR_FOND_RADIO#}" name=display_aspect_ratio_conversion value=letterbox></td></tr>
+<tr><td width="130">4/3 Combined</td><td><input type=radio bgcolor="{#COULEUR_FOND_RADIO#}" name=display_aspect_ratio_conversion value=combined></td></tr>
+<tr><td width="130">4/3 Pan Scan</td><td><input type=radio bgcolor="{#COULEUR_FOND_RADIO#}" name=display_aspect_ratio_conversion value=panscan></td></tr>
+<tr><td width="130">16/9</td><td><input type=radio bgcolor="{#COULEUR_FOND_RADIO#}" name=display_aspect_ratio_conversion value=ignore></td></tr>
</table>
+{/if}
+
<br>
<input bgcolor="{#COULEUR_TEXTBOX#}" type=submit value="Valider les modifications">
</form>
Modified: trunk/module/films/lecture.php
===================================================================
--- trunk/module/films/lecture.php 2007-05-21 16:17:12 UTC (rev 155)
+++ trunk/module/films/lecture.php 2007-05-22 19:34:43 UTC (rev 156)
@@ -235,7 +235,7 @@
if(trim($OSD)==''){
if($cansetfrontpannel and $VLC['etat']=='playing'){
if($vers_fbx>4 AND $VLC['duree_totale']>=5){
- set_refresh(2, '2;url=lecture.php');
+ set_refresh(3, '3;url=lecture.php');
}
$META['front_panel'] = calcul_hours($VLC['duree_courante']);
}
Modified: trunk/module/films/signet_film.tpl
===================================================================
--- trunk/module/films/signet_film.tpl 2007-05-21 16:17:12 UTC (rev 155)
+++ trunk/module/films/signet_film.tpl 2007-05-22 19:34:43 UTC (rev 156)
@@ -1,14 +1,14 @@
{section name=table loop=$CONTENT_TABLE}
{if $smarty.section.table.first}
Vous aviez enregistr\xE9 un signet pour ce film. A quel endroit du film voulez-vous aller ?<br \> <br \> <br \>
- <table cellpadding=0 cellspacing=0><tr><td>
- <tr><td width=434 bgcolor="#82B1EC6f"><a href="lecture.php">D\xE9but</a></td><td width="20" bgcolor="#82B1EC6f"><table width="20" height="20" border="0" cellpadding="0" cellspacing="0" bgcolor="#82B1EC6f"><tr height="20"><td align=center width="20" height="20" align="center" valign="middle"> </td></tr></table></td></tr>
+ <table cellpadding=0 cellspacing=0 width="434">
+ <tr><td width="434" bgcolor="#82B1EC6f"><a href="lecture.php">D\xE9but</a></td></tr>
{/if}
{cycle name=color assign=COLOR print=false values="#3482E03f,#82B1EC3f"}
- <tr><td width=434 bgcolor="{$COLOR}"><a href="lecture.php?control=seek&seek_value={$CONTENT_TABLE[table].duree}">{$CONTENT_TABLE[table].duree}</a></td><td width="20" bgcolor="{$COLOR}"><a href="{$MODULE}signet/supsignet.php?toplay={$CONTENT_TABLE[table].id}&temps={$CONTENT_TABLE[table].duree}&return=film"><table width="20" height="20" border="0" cellpadding="0" cellspacing="0" bgcolor="{$COLOR}" 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></tr>
+ <tr><td width="434" bgcolor="{$COLOR}"><a href="lecture.php?control=seek&seek_value={$CONTENT_TABLE[table].duree}">{$CONTENT_TABLE[table].duree}</a></td></tr>
{if $smarty.section.table.last}
- </table></td></tr></table>
+ </table>
{/if}
{/section}
Modified: trunk/module/mp3/audio.tpl
===================================================================
--- trunk/module/mp3/audio.tpl 2007-05-21 16:17:12 UTC (rev 155)
+++ trunk/module/mp3/audio.tpl 2007-05-22 19:34:43 UTC (rev 156)
@@ -114,12 +114,12 @@
<tr><td bgcolor="{#COULEUR_FOND2#}" colspan="2" width="625" height="25">
<table width="625" height="25" border="0" align="center" cellpadding="0" cellspacing="0">
<tr>
- <td width="104" align=center><a href="lecteuraudio.php?mode=pla" {if $mode=='pla'}focused{/if}><table width="104" height="25" border="0" cellpadding="0" cellspacing="0" bgcolor="{#COULEUR_FOND2#}" abgcolor="{#COULEUR_TABLE_SELECTED#}"><tr height="25"><td align=center width="104" height="25">Playlist</td></tr></table></a></td>
- <td width="104" align=center><a href="lecteuraudio.php?mode=bib" {if $mode=='bib'}focused{/if}><table width="104" height="25" border="0" cellpadding="0" cellspacing="0" bgcolor="{#COULEUR_FOND2#}" abgcolor="{#COULEUR_TABLE_SELECTED#}"><tr height="25"><td align=center width="104" height="25">Biblioth\xE8que</td></tr></table></a></td>
- <td width="104" align=center><a href="lecteuraudio.php?mode=exp" {if $mode=='exp'}focused{/if}><table width="104" height="25" border="0" cellpadding="0" cellspacing="0" bgcolor="{#COULEUR_FOND2#}" abgcolor="{#COULEUR_TABLE_SELECTED#}"><tr height="25"><td align=center width="104" height="25">Explorateur</td></tr></table></a></td>
- <td width="104" align=center><a href="lecteuraudio.php?mode=par" {if $mode=='par'}focused{/if}><table width="104" height="25" border="0" cellpadding="0" cellspacing="0" bgcolor="{#COULEUR_FOND2#}" abgcolor="{#COULEUR_TABLE_SELECTED#}"><tr height="25"><td align=center width="104" height="25">Paroles</td></tr></table></a></td>
- <td width="104" align=center><a href="lecteuraudio.php?mode=pod" {if $mode=='pod'}focused{/if}><table width="104" height="25" border="0" cellpadding="0" cellspacing="0" bgcolor="{#COULEUR_FOND2#}" abgcolor="{#COULEUR_TABLE_SELECTED#}"><tr height="25"><td align=center width="104" height="25">Podcast</td></tr></table></a></td>
- <td width="104" align=center><a href="lecteuraudio.php?mode=web" {if $mode=='web'}focused{/if}><table width="104" height="25" border="0" cellpadding="0" cellspacing="0" bgcolor="{#COULEUR_FOND2#}" abgcolor="{#COULEUR_TABLE_SELECTED#}"><tr height="25"><td align=center width="104" height="25">Web-Radios</td></tr></table></a></td>
+ <td width="104" align=center><a href="lecteuraudio.php?mode=pla" onfocus='front_panel="PLAYLIST";' {if $mode=='pla'}focused{/if}><table width="104" height="25" border="0" cellpadding="0" cellspacing="0" bgcolor="{#COULEUR_FOND2#}" abgcolor="{#COULEUR_TABLE_SELECTED#}"><tr height="25"><td align=center width="104" height="25">Playlist</td></tr></table></a></td>
+ <td width="104" align=center><a href="lecteuraudio.php?mode=bib" onfocus='front_panel="BIBLIOTH";' {if $mode=='bib'}focused{/if}><table width="104" height="25" border="0" cellpadding="0" cellspacing="0" bgcolor="{#COULEUR_FOND2#}" abgcolor="{#COULEUR_TABLE_SELECTED#}"><tr height="25"><td align=center width="104" height="25">Biblioth\xE8que</td></tr></table></a></td>
+ <td width="104" align=center><a href="lecteuraudio.php?mode=exp" onfocus='front_panel="EXPLORAT";' {if $mode=='exp'}focused{/if}><table width="104" height="25" border="0" cellpadding="0" cellspacing="0" bgcolor="{#COULEUR_FOND2#}" abgcolor="{#COULEUR_TABLE_SELECTED#}"><tr height="25"><td align=center width="104" height="25">Explorateur</td></tr></table></a></td>
+ <td width="104" align=center><a href="lecteuraudio.php?mode=par" onfocus='front_panel="PAROLES";' {if $mode=='par'}focused{/if}><table width="104" height="25" border="0" cellpadding="0" cellspacing="0" bgcolor="{#COULEUR_FOND2#}" abgcolor="{#COULEUR_TABLE_SELECTED#}"><tr height="25"><td align=center width="104" height="25">Paroles</td></tr></table></a></td>
+ <td width="104" align=center><a href="lecteuraudio.php?mode=pod" onfocus='front_panel="PODCAST";' {if $mode=='pod'}focused{/if}><table width="104" height="25" border="0" cellpadding="0" cellspacing="0" bgcolor="{#COULEUR_FOND2#}" abgcolor="{#COULEUR_TABLE_SELECTED#}"><tr height="25"><td align=center width="104" height="25">Podcast</td></tr></table></a></td>
+ <td width="104" align=center><a href="lecteuraudio.php?mode=web" onfocus='front_panel="WEBMEDIA";' {if $mode=='web'}focused{/if}><table width="104" height="25" border="0" cellpadding="0" cellspacing="0" bgcolor="{#COULEUR_FOND2#}" abgcolor="{#COULEUR_TABLE_SELECTED#}"><tr height="25"><td align=center width="104" height="25">Web-Radios</td></tr></table></a></td>
</tr>
</table>
</td></tr>
@@ -128,7 +128,7 @@
{eval var=$CONTENT}
- <var name=aide width=450>
+ <var name=aide width=650>
</td></tr>
</table>
Modified: trunk/module/signet/playsignet.php
===================================================================
--- trunk/module/signet/playsignet.php 2007-05-21 16:17:12 UTC (rev 155)
+++ trunk/module/signet/playsignet.php 2007-05-22 19:34:43 UTC (rev 156)
@@ -8,9 +8,8 @@
save_variable('lastrep', dirname($basename));
save_variable('rep_min', '0');
-sleep(2);
-$file1 = file_get_contents('http://127.0.0.1:8081/lecteur/action.html?control=seek&seek_value='.$value);
-$META['refresh']= '0;url='.$RACINE_REP.'module/films/info.php';
+sleep(1);
+$META['refresh']= '0;url='.$RACINE_REP.'module/films/lecture.php?control=seek&seek_value='.$value;
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<html>
Modified: trunk/module/stage6/index1.php
===================================================================
--- trunk/module/stage6/index1.php 2007-05-21 16:17:12 UTC (rev 155)
+++ trunk/module/stage6/index1.php 2007-05-22 19:34:43 UTC (rev 156)
@@ -8,8 +8,8 @@
$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'));
-
+ //array('lien'=>'index1.php?show=rec', 'nom'=>'Recherche', 'selected'=>$show=='rec'));
+ );
$title = array('recent'=>'Les plus r\xE9cents', 'vus'=>'Les plus vus', 'note'=>'Les mieux not\xE9s', 'rec'=>'Recherche');
$smarty->assign('TITRE','Vid\xE9os Stage6 - '.$title[$show]);
Modified: trunk/module/stage6/play_stage6.php
===================================================================
--- trunk/module/stage6/play_stage6.php 2007-05-21 16:17:12 UTC (rev 155)
+++ trunk/module/stage6/play_stage6.php 2007-05-22 19:34:43 UTC (rev 156)
@@ -5,7 +5,7 @@
$url = urldecode($_REQUEST['url']);
- save_variable('backToURL', dirname($_SERVER['SCRIPT_NAME']).'/index1.php?show='.$_GET['show'].'&start='.$_GET['min'].'&string='.$_GET['string']);
+ save_variable('backToURL', dirname($_SERVER['SCRIPT_NAME']).'/index1.php?show='.$_GET['show'].'&start='.$_GET['min']);
play_fichier('type=40',$url,0,'backToURL','',$_GET['duree']);
$LINK['stop']=$MODULE.'films/lecture.php?control=stop';
Added: trunk/module/telesite/index.php
===================================================================
--- trunk/module/telesite/index.php (rev 0)
+++ trunk/module/telesite/index.php 2007-05-22 19:34:43 UTC (rev 156)
@@ -0,0 +1,11 @@
+<?php
+$RACINE_REP = "../../";
+require($RACINE_REP.'_framework/framework.php');
+
+$base = 'http://www.freeplayer.org/freebox/hj/';
+$contenu = file_get_contents($base.'index.php?'.$_SERVER['QUERY_STRING']);
+$contenu = str_replace('src="images/', 'src="'.$IMG2FBX.'?cache=1&img='.urlencode($base.'images/'), $contenu);
+
+echo $contenu;
+
+?>
Modified: trunk/skin/mediacenter/audio.tpl
===================================================================
--- trunk/skin/mediacenter/audio.tpl 2007-05-21 16:17:12 UTC (rev 155)
+++ trunk/skin/mediacenter/audio.tpl 2007-05-22 19:34:43 UTC (rev 156)
@@ -23,6 +23,7 @@
$smarty->assign('CONTENT2',$smarty->fetch('interface.tpl'));
{/php}
{$CONTENT2}
+ <center><var name=aide width=450></center>
{*
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<html>
Modified: trunk/skin/mediacenter/framework_skin.php
===================================================================
--- trunk/skin/mediacenter/framework_skin.php 2007-05-21 16:17:12 UTC (rev 155)
+++ trunk/skin/mediacenter/framework_skin.php 2007-05-22 19:34:43 UTC (rev 156)
@@ -35,7 +35,7 @@
// 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;
- if(((eregi("stop",$contenu_html) AND $BACKGROUND!="none" AND realpath($BACKGROUND_REP.$BACKGROUND)!='') OR $FORCED) AND !$BACK_DONE){
+ if((((eregi("stop",$contenu_html) AND $BACKGROUND!="none" AND realpath($BACKGROUND_REP.$BACKGROUND)!='') AND !eregi($BACKGROUND,$contenu_html)) OR $FORCED) AND !$BACK_DONE){
if($BACKGROUND_TYPE == 'add'){
play_fichier('type=21&temps=3000',realpath($BACKGROUND_REP.$BACKGROUND),1,'photo');
}else{
@@ -62,7 +62,7 @@
$_multipage['lien'] = $lien;
$_multipage['step'] = $step;
$_multipage['total'] = $total;
- $_multipage['nb_page'] = ceil($total/$step);
+ $_multipage['nb_page'] = max(ceil($total/$step),1);
$_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);
@@ -92,7 +92,7 @@
}
function _multipage_pagination(){
-global $_multipage;
- //return '<font size="1">Page '.$_multipage['current_page'].' / '.$_multipage['nb_page'].'</font>';
+global $_multipage, $smarty;
+ $smarty->assign('MULTI_ACTIF',true);
}
?>
Added: trunk/skin/mediacenter/interface/pagination.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/mediacenter/interface/pagination.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/skin/mediacenter/interface.tpl
===================================================================
--- trunk/skin/mediacenter/interface.tpl 2007-05-21 16:17:12 UTC (rev 155)
+++ trunk/skin/mediacenter/interface.tpl 2007-05-22 19:34:43 UTC (rev 156)
@@ -15,17 +15,21 @@
</tr>
<tr>
<td width="130" height="415" valign="top">
-
- <table><tr height="20"><td> </td></tr>
+{assign var=compter value=376}
+ <table height="415"><tr height="20"><td> </td></tr>
{section name=menu_alt loop=$MENU_ALT}
<tr><td width="115"><a onfocus='front_panel="{$MENU_ALT[menu_alt].front_pannel|default:$MENU_ALT[menu_alt].nom|cleanaff}";' href="{$MENU_ALT[menu_alt].lien}"{if $MENU_ALT[menu_alt].selected} focused{/if}><table width="115" border="0" cellpadding="0" cellspacing="0" bgcolor="{#COULEUR_FOND2#}" abgcolor="{#COULEUR_TABLE_SELECTED#}"><tr><td>{$MENU_ALT[menu_alt].nom}</td></tr></table></a></td></tr>
{if $smarty.section.menu_alt.last}
<tr><td width="115"><a onfocus='front_panel="RETOUR";' href="{$LINK.red}"><table width="115" border="0" cellpadding="0" cellspacing="0" bgcolor="{#COULEUR_FOND2#}" abgcolor="{#COULEUR_TABLE_SELECTED#}"><tr><td><img src="{$INTERFACE_REP}btn_rouge.gif" border="0"> Retour</td></tr></table></a></td></tr>
- {/if}
+ {assign var=compter value=$compter-20}
+ {/if}
+ {assign var=compter value=$compter-20}
{sectionelse}
{section name=menu_header loop=$MENU_SUP}
<tr><td width="115"><a onfocus='front_panel="{$MENU_SUP[menu_header].name|cleanaff}";' href="{$MODULE}_menu/menu.php?cat={$MENU_SUP[menu_header].nb}&show=1" {if $cat==$MENU_SUP[menu_header].nb} focused{/if}><table width="115" border="0" cellpadding="0" cellspacing="0" bgcolor="{#COULEUR_FOND2#}" abgcolor="{#COULEUR_TABLE_SELECTED#}"><tr><td>{$MENU_SUP[menu_header].name}</td></tr></table></a></td>
+ {assign var=compter value=$compter-20}
{if $smarty.section.menu_header.last}
+ {assign var=compter value=$compter-20}
{if $LINK.red}
<tr><td width="115"><a onfocus='front_panel="RETOUR";' href="{$LINK.red}"><table width="115" border="0" cellpadding="0" cellspacing="0" bgcolor="{#COULEUR_FOND2#}" abgcolor="{#COULEUR_TABLE_SELECTED#}"><tr><td><img src="{$INTERFACE_REP}btn_rouge.gif" border="0"> Retour</td></tr></table></a></td></tr>
{else}
@@ -34,6 +38,8 @@
{/if}
{/section}
{/section}
+ <tr><td height="{$compter}"><img src="blank.gif" height="{$compter}"></td></tr>
+ <tr><td height="39" width="97" background="{$PLAYER_REP}pagination.gif">{if $MULTI_ACTIF}{$_multipage.current_page} / {$_multipage.nb_page}{/if}</td></tr>
</table>
Modified: trunk/skin/mediacenter/menu.tpl
===================================================================
--- trunk/skin/mediacenter/menu.tpl 2007-05-21 16:17:12 UTC (rev 155)
+++ trunk/skin/mediacenter/menu.tpl 2007-05-22 19:34:43 UTC (rev 156)
@@ -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";{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 focused onfocus='front_panel="FILMS";location="ts://127.0.0.1?ox=0&oy=0&ow=720&oh=576,&ix=0&iy=0&iw=360&ih=192";service="ts://127.0.0.1?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";{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 onfocus='front_panel="MODULES";location="ts://127.0.0.1?ox=0&oy=0&ow=720&oh=576,&ix=0&iy=384&iw=360&ih=192";service="ts://127.0.0.1?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";{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 onfocus='front_panel="PHOTO";location="ts://127.0.0.1?ox=0&oy=0&ow=720&oh=576,&ix=360&iy=192&iw=360&ih=192";service="ts://127.0.0.1?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";{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 onfocus='front_panel="AUDIO";location="ts://127.0.0.1?ox=0&oy=0&ow=720&oh=576,&ix=0&iy=192&iw=360&ih=192";service="ts://127.0.0.1?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";{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 onfocus='front_panel="BIBLIOTHEQUE";location="ts://127.0.0.1?ox=0&oy=0&ow=720&oh=576,&ix=360&iy=0&iw=360&ih=192";service="ts://127.0.0.1?ox=0&oy=0&ow=720&oh=576,&ix=360&iy=0&iw=360&ih=192";' href="../../module/films/catalogue.php">
</a>
{/if}
Modified: trunk/skin/simple/framework_skin.php
===================================================================
--- trunk/skin/simple/framework_skin.php 2007-05-21 16:17:12 UTC (rev 155)
+++ trunk/skin/simple/framework_skin.php 2007-05-22 19:34:43 UTC (rev 156)
@@ -31,7 +31,7 @@
// 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, $smarty;
- if(((eregi("stop",$contenu_html) AND $BACKGROUND!="none" AND realpath($BACKGROUND_REP.$BACKGROUND)!='') OR $FORCED) AND !$BACK_DONE){
+ if((((eregi("stop",$contenu_html) AND $BACKGROUND!="none" AND realpath($BACKGROUND_REP.$BACKGROUND)!='') AND !eregi($BACKGROUND,$contenu_html)) OR $FORCED) AND !$BACK_DONE){
if($BACKGROUND_TYPE == 'add'){
play_fichier('type=21&temps=8000',realpath($BACKGROUND_REP.$BACKGROUND),1,'photo');
}else{
@@ -58,7 +58,7 @@
$_multipage['lien'] = $lien;
$_multipage['step'] = $step;
$_multipage['total'] = $total;
- $_multipage['nb_page'] = ceil($total/$step);
+ $_multipage['nb_page'] = max(ceil($total/$step),1);
$_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);
@@ -71,7 +71,7 @@
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>';
+ 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;
}
Modified: trunk/skin/simplegreen/framework_skin.php
===================================================================
--- trunk/skin/simplegreen/framework_skin.php 2007-05-21 16:17:12 UTC (rev 155)
+++ trunk/skin/simplegreen/framework_skin.php 2007-05-22 19:34:43 UTC (rev 156)
@@ -31,7 +31,7 @@
// 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, $smarty;
- if(((eregi("stop",$contenu_html) AND $BACKGROUND!="none" AND realpath($BACKGROUND_REP.$BACKGROUND)!='') OR $FORCED) AND !$BACK_DONE){
+ if((((eregi("stop",$contenu_html) AND $BACKGROUND!="none" AND realpath($BACKGROUND_REP.$BACKGROUND)!='') AND !eregi($BACKGROUND,$contenu_html)) OR $FORCED) AND !$BACK_DONE){
if($BACKGROUND_TYPE == 'add'){
play_fichier('type=21&temps=8000',realpath($BACKGROUND_REP.$BACKGROUND),1,'photo');
}else{
@@ -58,7 +58,7 @@
$_multipage['lien'] = $lien;
$_multipage['step'] = $step;
$_multipage['total'] = $total;
- $_multipage['nb_page'] = ceil($total/$step);
+ $_multipage['nb_page'] = max(ceil($total/$step),1);
$_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);
@@ -71,7 +71,7 @@
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>';
+ 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;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ara...@us...> - 2007-05-28 20:03:22
|
Revision: 165
http://svn.sourceforge.net/easybox-mod/?rev=165&view=rev
Author: aragornis
Date: 2007-05-28 13:03:19 -0700 (Mon, 28 May 2007)
Log Message:
-----------
- d?\195?\169but du t?\195?\169l?\195?\169site
Added Paths:
-----------
trunk/module/telesites/
trunk/module/telesites/index1.php
trunk/module/telesites/telesite.tpl
trunk/skin/ETI/chaines/
trunk/skin/ETI/chaines/2MMaroc.gif
trunk/skin/ETI/chaines/AB1.gif
trunk/skin/ETI/chaines/ABMoteurs.gif
trunk/skin/ETI/chaines/AlJazeera.gif
trunk/skin/ETI/chaines/AlJazeeraChildren.gif
trunk/skin/ETI/chaines/AlMasriya.gif
trunk/skin/ETI/chaines/ArmeniaTV.gif
trunk/skin/ETI/chaines/Arte.gif
trunk/skin/ETI/chaines/ArteAllemand.gif
trunk/skin/ETI/chaines/AstroCenterTV.gif
trunk/skin/ETI/chaines/BFMTV.gif
trunk/skin/ETI/chaines/Bestofshopping.gif
trunk/skin/ETI/chaines/BloombergTV.gif
trunk/skin/ETI/chaines/BulgariaTv.gif
trunk/skin/ETI/chaines/CANAL+.gif
trunk/skin/ETI/chaines/DW-TV.gif
trunk/skin/ETI/chaines/Demain_.gif
trunk/skin/ETI/chaines/Direct8.gif
trunk/skin/ETI/chaines/Euronews.gif
trunk/skin/ETI/chaines/Europe2TV.gif
trunk/skin/ETI/chaines/FashionTV.gif
trunk/skin/ETI/chaines/France2.gif
trunk/skin/ETI/chaines/France3.gif
trunk/skin/ETI/chaines/France4.gif
trunk/skin/ETI/chaines/France5.gif
trunk/skin/ETI/chaines/Franceo.gif
trunk/skin/ETI/chaines/FreenewsTV.gif
trunk/skin/ETI/chaines/FunTV.gif
trunk/skin/ETI/chaines/GameOne.gif
trunk/skin/ETI/chaines/GodTV.gif
trunk/skin/ETI/chaines/Image2.gif
trunk/skin/ETI/chaines/KTO.gif
trunk/skin/ETI/chaines/Kanal7INT.gif
trunk/skin/ETI/chaines/L'?\195?\169quipeTV.gif
trunk/skin/ETI/chaines/L'Equipetv.gif
trunk/skin/ETI/chaines/LaChaineMarseille.gif
trunk/skin/ETI/chaines/LaChaineParlementaire.gif
trunk/skin/ETI/chaines/Lalocale.gif
trunk/skin/ETI/chaines/LibertyTV.com.gif
trunk/skin/ETI/chaines/M6Boutique.gif
trunk/skin/ETI/chaines/M6Musicblack.gif
trunk/skin/ETI/chaines/M6Musichits.gif
trunk/skin/ETI/chaines/M6Musicrock.gif
trunk/skin/ETI/chaines/MTVFrance.gif
trunk/skin/ETI/chaines/MireFREEBOX.gif
trunk/skin/ETI/chaines/Motorstv.gif
trunk/skin/ETI/chaines/NRJ12.gif
trunk/skin/ETI/chaines/NRJ125.1.gif
trunk/skin/ETI/chaines/NRJ12Stereo.gif
trunk/skin/ETI/chaines/NT1.gif
trunk/skin/ETI/chaines/NormandieTV.gif
trunk/skin/ETI/chaines/PhoenixChineseNewsandEntertainment.gif
trunk/skin/ETI/chaines/RTL9.gif
trunk/skin/ETI/chaines/RTMMaroc.gif
trunk/skin/ETI/chaines/RTPi.gif
trunk/skin/ETI/chaines/RTRPlaneta.gif
trunk/skin/ETI/chaines/RaiDue.gif
trunk/skin/ETI/chaines/RaiTre.gif
trunk/skin/ETI/chaines/RaiUno.gif
trunk/skin/ETI/chaines/RealMadridTV.gif
trunk/skin/ETI/chaines/SamanyoluTV.gif
trunk/skin/ETI/chaines/SkyNews.gif
trunk/skin/ETI/chaines/SkyNewsInternational.gif
trunk/skin/ETI/chaines/TRTINT.gif
trunk/skin/ETI/chaines/TV5.gif
trunk/skin/ETI/chaines/TV7Bordeaux.gif
trunk/skin/ETI/chaines/TV7Tunisia.gif
trunk/skin/ETI/chaines/TV8Mont-Blanc.gif
trunk/skin/ETI/chaines/TVEInternational.gif
trunk/skin/ETI/chaines/TVPolonia.gif
trunk/skin/ETI/chaines/TVRomania.gif
trunk/skin/ETI/chaines/TeleGrenoble.gif
trunk/skin/ETI/chaines/Telenantes_Nantes7.gif
trunk/skin/ETI/chaines/Teleplaisance.org.gif
trunk/skin/ETI/chaines/Thumbs.db
trunk/skin/ETI/chaines/W9.gif
trunk/skin/ETI/chaines/adjaraTV.gif
trunk/skin/ETI/chaines/beurtv.gif
trunk/skin/ETI/chaines/canalalgerie.gif
trunk/skin/ETI/chaines/canalplus.gif
trunk/skin/ETI/chaines/cctv4.gif
trunk/skin/ETI/chaines/cnbc.gif
trunk/skin/ETI/chaines/cnbceurope.gif
trunk/skin/ETI/chaines/demain.gif
trunk/skin/ETI/chaines/etbSat.gif
trunk/skin/ETI/chaines/freenews.gif
trunk/skin/ETI/chaines/gulli.gif
trunk/skin/ETI/chaines/iTELE.gif
trunk/skin/ETI/chaines/moteur.gif
trunk/skin/ETI/chaines/mtv.gif
trunk/skin/ETI/chaines/t.tv.gif
trunk/skin/ETI/chaines/telif.gif
trunk/skin/ETI/chaines/tf1.gif
trunk/skin/ETI/chaines/tfj.gif
trunk/skin/ETI/chaines/tlm.gif
trunk/skin/ETI/chaines/tlt.gif
trunk/skin/ETI/chaines/zik.gif
trunk/skin/ETI/couleur.conf
trunk/skin/ETI/demarrage.tpl
trunk/skin/ETI/dossier/
trunk/skin/ETI/dossier/Thumbs.db
trunk/skin/ETI/dossier/diskhdd.gif
trunk/skin/ETI/dossier/diskhddbad.gif
trunk/skin/ETI/dossier/disknetwork.gif
trunk/skin/ETI/dossier/disknetworkbad.gif
trunk/skin/ETI/dossier/diskoptical.gif
trunk/skin/ETI/dossier/diskopticalbad.gif
trunk/skin/ETI/dossier/diskremovable.gif
trunk/skin/ETI/dossier/diskremovableKO.gif
trunk/skin/ETI/dossier/disque.gif
trunk/skin/ETI/dossier/disquecd.gif
trunk/skin/ETI/dossier/favoris.gif
trunk/skin/ETI/dossier/folder.gif
trunk/skin/ETI/dossier/movie.gif
trunk/skin/ETI/dossier/mp3.gif
trunk/skin/ETI/dossier/noname.gif
trunk/skin/ETI/dossier/parent.gif
trunk/skin/ETI/dossier/picture.gif
trunk/skin/ETI/dossier/reload.gif
trunk/skin/ETI/dossier/rep_all.gif
trunk/skin/ETI/explorateur.tpl
trunk/skin/ETI/films.tpl
trunk/skin/ETI/framework_skin.php
trunk/skin/ETI/horloge.tpl
trunk/skin/ETI/icones/
trunk/skin/ETI/icones/Agenda.gif
trunk/skin/ETI/icones/AnnuaireFreebox.gif
trunk/skin/ETI/icones/Audio.gif
trunk/skin/ETI/icones/Cac40.gif
trunk/skin/ETI/icones/Cinema.gif
trunk/skin/ETI/icones/DVD.gif
trunk/skin/ETI/icones/Emissions.gif
trunk/skin/ETI/icones/Enregistrement.gif
trunk/skin/ETI/icones/Ephemeride.gif
trunk/skin/ETI/icones/Favoris.gif
trunk/skin/ETI/icones/Films.gif
trunk/skin/ETI/icones/GuideTV.gif
trunk/skin/ETI/icones/Internet.gif
trunk/skin/ETI/icones/Livescore.gif
trunk/skin/ETI/icones/Mails.gif
trunk/skin/ETI/icones/Messagerie.gif
trunk/skin/ETI/icones/Meteo.gif
trunk/skin/ETI/icones/Modules.gif
trunk/skin/ETI/icones/Multimedia.gif
trunk/skin/ETI/icones/Photos.gif
trunk/skin/ETI/icones/Pratique.gif
trunk/skin/ETI/icones/ProgrammeCine.gif
trunk/skin/ETI/icones/RSS.gif
trunk/skin/ETI/icones/Shutdown.gif
trunk/skin/ETI/icones/Signet.gif
trunk/skin/ETI/icones/SortiesCine.gif
trunk/skin/ETI/icones/Thumbs.db
trunk/skin/ETI/icones/Web.gif
trunk/skin/ETI/icones/WebMedia.gif
trunk/skin/ETI/images/
trunk/skin/ETI/images/background/
trunk/skin/ETI/images/background/Thumbs.db
trunk/skin/ETI/images/background/background.gif
trunk/skin/ETI/images/background/background.jpg
trunk/skin/ETI/images/background/background.png
trunk/skin/ETI/images/background/backgrounddetail.gif
trunk/skin/ETI/images/background/backgrounddetail.png
trunk/skin/ETI/images/background/backgroundgeneral.gif
trunk/skin/ETI/images/background/backgroundgeneral.png
trunk/skin/ETI/images/background/backgroundsub.gif
trunk/skin/ETI/images/background/backgroundsub.png
trunk/skin/ETI/images/button_selected.png
trunk/skin/ETI/images/buttons/
trunk/skin/ETI/images/buttons/Thumbs.db
trunk/skin/ETI/images/buttons/avance.gif
trunk/skin/ETI/images/buttons/avance_petit.gif
trunk/skin/ETI/images/buttons/boucle1.gif
trunk/skin/ETI/images/buttons/boucle_all.gif
trunk/skin/ETI/images/buttons/debut_rep.gif
trunk/skin/ETI/images/buttons/delete.gif
trunk/skin/ETI/images/buttons/descendre_select.gif
trunk/skin/ETI/images/buttons/descendre_select_20.gif
trunk/skin/ETI/images/buttons/descendre_unselect.gif
trunk/skin/ETI/images/buttons/descendre_unselect_20.gif
trunk/skin/ETI/images/buttons/droite.gif
trunk/skin/ETI/images/buttons/fin_rep.gif
trunk/skin/ETI/images/buttons/folder.png
trunk/skin/ETI/images/buttons/gauche.gif
trunk/skin/ETI/images/buttons/lecture.gif
trunk/skin/ETI/images/buttons/moins.gif
trunk/skin/ETI/images/buttons/monter_select.gif
trunk/skin/ETI/images/buttons/monter_select_20.gif
trunk/skin/ETI/images/buttons/monter_unselect.gif
trunk/skin/ETI/images/buttons/monter_unselect_20.gif
trunk/skin/ETI/images/buttons/pause.gif
trunk/skin/ETI/images/buttons/petit_lecture.gif
trunk/skin/ETI/images/buttons/plus.gif
trunk/skin/ETI/images/buttons/precedent.gif
trunk/skin/ETI/images/buttons/recule.gif
trunk/skin/ETI/images/buttons/recule_petit.gif
trunk/skin/ETI/images/buttons/source/
trunk/skin/ETI/images/buttons/source/Thumbs.db
trunk/skin/ETI/images/buttons/source/next2_jer_suite.png
trunk/skin/ETI/images/buttons/source/next_jer_suite.png
trunk/skin/ETI/images/buttons/source/pause_jer_suite.png
trunk/skin/ETI/images/buttons/source/play_jer_suite.png
trunk/skin/ETI/images/buttons/source/prec2_jer_suite.png
trunk/skin/ETI/images/buttons/source/prec_jer_suite.png
trunk/skin/ETI/images/buttons/source/stop_jer_suite.png
trunk/skin/ETI/images/buttons/stop.gif
trunk/skin/ETI/images/buttons/sub_b_arrow_down_hl.png
trunk/skin/ETI/images/buttons/sub_b_arrow_left_hl.png
trunk/skin/ETI/images/buttons/sub_b_arrow_right_hl.png
trunk/skin/ETI/images/buttons/sub_b_arrow_up_hl.png
trunk/skin/ETI/images/buttons/sub_b_scrolldown_hl.png
trunk/skin/ETI/images/buttons/sub_b_scrollup_hl.png
trunk/skin/ETI/images/buttons/sub_b_trans.png
trunk/skin/ETI/images/buttons/suivant.gif
trunk/skin/ETI/images/buttons/supprimer.gif
trunk/skin/ETI/images/buttons/unmute.png
trunk/skin/ETI/images/c_image.tpl
trunk/skin/ETI/images/c_liste.tpl
trunk/skin/ETI/images/c_liste_seul.tpl
trunk/skin/ETI/images/c_menu-liste.tpl
trunk/skin/ETI/images/c_mini_menu.tpl
trunk/skin/ETI/images/dossier/
trunk/skin/ETI/images/dossier/Thumbs.db
trunk/skin/ETI/images/dossier/aide.gif
trunk/skin/ETI/images/dossier/avertissement.gif
trunk/skin/ETI/images/dossier/big_dossier.gif
trunk/skin/ETI/images/dossier/dossier.gif
trunk/skin/ETI/images/dossier/favoris.gif
trunk/skin/ETI/images/dossier/movie.gif
trunk/skin/ETI/images/dossier/mp3.gif
trunk/skin/ETI/images/icons/
trunk/skin/ETI/images/icons/Agenda.gif
trunk/skin/ETI/images/icons/Audio.gif
trunk/skin/ETI/images/icons/Cinema.gif
trunk/skin/ETI/images/icons/Emissions.gif
trunk/skin/ETI/images/icons/Enregistrement.gif
trunk/skin/ETI/images/icons/Ephemeride.gif
trunk/skin/ETI/images/icons/Favoris.gif
trunk/skin/ETI/images/icons/Films.gif
trunk/skin/ETI/images/icons/GuideTV.gif
trunk/skin/ETI/images/icons/Horloge.gif
trunk/skin/ETI/images/icons/Html-Light.gif
trunk/skin/ETI/images/icons/Info-Trafic.gif
trunk/skin/ETI/images/icons/Infos.gif
trunk/skin/ETI/images/icons/Installermodules.gif
trunk/skin/ETI/images/icons/Internet.gif
trunk/skin/ETI/images/icons/Livescore.gif
trunk/skin/ETI/images/icons/Loto.gif
trunk/skin/ETI/images/icons/Mails.gif
trunk/skin/ETI/images/icons/Messagerie.gif
trunk/skin/ETI/images/icons/Meteo.gif
trunk/skin/ETI/images/icons/MeteoFT.gif
trunk/skin/ETI/images/icons/Miseajour.gif
trunk/skin/ETI/images/icons/Morpion.gif
trunk/skin/ETI/images/icons/Multimedia.gif
trunk/skin/ETI/images/icons/Pendu.gif
trunk/skin/ETI/images/icons/Photos.gif
trunk/skin/ETI/images/icons/Pratique.gif
trunk/skin/ETI/images/icons/ProgrammeCine.gif
trunk/skin/ETI/images/icons/RSS.gif
trunk/skin/ETI/images/icons/ReseauFree.fr.gif
trunk/skin/ETI/images/icons/Shutdown.gif
trunk/skin/ETI/images/icons/Signet.gif
trunk/skin/ETI/images/icons/SortiesCine.gif
trunk/skin/ETI/images/icons/Sudoku.gif
trunk/skin/ETI/images/icons/Thumbs.db
trunk/skin/ETI/images/icons/WebMedia.gif
trunk/skin/ETI/images/icons/annuairefreebox.gif
trunk/skin/ETI/images/icons/cac40.gif
trunk/skin/ETI/images/icons/cd.gif
trunk/skin/ETI/images/icons/dvd.gif
trunk/skin/ETI/images/icons/ecouter.gif
trunk/skin/ETI/images/icons/explorer.gif
trunk/skin/ETI/images/icons/firefox.gif
trunk/skin/ETI/images/icons/games.gif
trunk/skin/ETI/images/icons/horloge-mini.gif
trunk/skin/ETI/images/icons/light/
trunk/skin/ETI/images/icons/light/AnnuaireFreebox.gif
trunk/skin/ETI/images/icons/light/Audio.gif
trunk/skin/ETI/images/icons/light/Cac40.gif
trunk/skin/ETI/images/icons/light/Cinema.gif
trunk/skin/ETI/images/icons/light/Emissions.gif
trunk/skin/ETI/images/icons/light/Enregistrement.gif
trunk/skin/ETI/images/icons/light/Ephemeride.gif
trunk/skin/ETI/images/icons/light/Favoris.gif
trunk/skin/ETI/images/icons/light/Films.gif
trunk/skin/ETI/images/icons/light/GuideTV.gif
trunk/skin/ETI/images/icons/light/Horloge.gif
trunk/skin/ETI/images/icons/light/Html-Light.gif
trunk/skin/ETI/images/icons/light/Info-Trafic.gif
trunk/skin/ETI/images/icons/light/Infos.gif
trunk/skin/ETI/images/icons/light/Installermodules.gif
trunk/skin/ETI/images/icons/light/Internet.gif
trunk/skin/ETI/images/icons/light/Livescore.gif
trunk/skin/ETI/images/icons/light/Loto.gif
trunk/skin/ETI/images/icons/light/Mails.gif
trunk/skin/ETI/images/icons/light/Messagerie.gif
trunk/skin/ETI/images/icons/light/Meteo.gif
trunk/skin/ETI/images/icons/light/MeteoFT.gif
trunk/skin/ETI/images/icons/light/Miseajour.gif
trunk/skin/ETI/images/icons/light/Morpion.gif
trunk/skin/ETI/images/icons/light/Multimedia.gif
trunk/skin/ETI/images/icons/light/Pendu.gif
trunk/skin/ETI/images/icons/light/Photos.gif
trunk/skin/ETI/images/icons/light/Pratique.gif
trunk/skin/ETI/images/icons/light/ProgrammeCine.gif
trunk/skin/ETI/images/icons/light/RSS.gif
trunk/skin/ETI/images/icons/light/ReseauFree.fr.gif
trunk/skin/ETI/images/icons/light/Shutdown.gif
trunk/skin/ETI/images/icons/light/Signet.gif
trunk/skin/ETI/images/icons/light/SortiesCine.gif
trunk/skin/ETI/images/icons/light/Sudoku.gif
trunk/skin/ETI/images/icons/light/Thumbs.db
trunk/skin/ETI/images/icons/light/WebMedia.gif
trunk/skin/ETI/images/icons/light/agenda.gif
trunk/skin/ETI/images/icons/light/cd.gif
trunk/skin/ETI/images/icons/light/dvd.gif
trunk/skin/ETI/images/icons/light/ecouter.gif
trunk/skin/ETI/images/icons/light/explorer.gif
trunk/skin/ETI/images/icons/light/firefox.gif
trunk/skin/ETI/images/icons/light/games.gif
trunk/skin/ETI/images/icons/light/horloge-mini.gif
trunk/skin/ETI/images/icons/light/menunews.gif
trunk/skin/ETI/images/icons/light/news.gif
trunk/skin/ETI/images/icons/light/pictures.gif
trunk/skin/ETI/images/icons/light/regarder.gif
trunk/skin/ETI/images/icons/light/settings.gif
trunk/skin/ETI/images/icons/light/web.gif
trunk/skin/ETI/images/icons/menunews.gif
trunk/skin/ETI/images/icons/news.gif
trunk/skin/ETI/images/icons/pictures.gif
trunk/skin/ETI/images/icons/regarder.gif
trunk/skin/ETI/images/icons/settings.gif
trunk/skin/ETI/images/icons/web.gif
trunk/skin/ETI/images/icons without capsules/
trunk/skin/ETI/images/icons without capsules/News.png
trunk/skin/ETI/images/icons without capsules/Thumbs.db
trunk/skin/ETI/images/icons without capsules/cd.png
trunk/skin/ETI/images/icons without capsules/close.png
trunk/skin/ETI/images/icons without capsules/computer.png
trunk/skin/ETI/images/icons without capsules/dvd.png
trunk/skin/ETI/images/icons without capsules/explorer.png
trunk/skin/ETI/images/icons without capsules/games.png
trunk/skin/ETI/images/icons without capsules/jukebox.png
trunk/skin/ETI/images/icons without capsules/media.png
trunk/skin/ETI/images/icons without capsules/music.png
trunk/skin/ETI/images/icons without capsules/nowplaying.png
trunk/skin/ETI/images/icons without capsules/photos.png
trunk/skin/ETI/images/icons without capsules/pictures.png
trunk/skin/ETI/images/icons without capsules/settings.png
trunk/skin/ETI/images/icons without capsules/weather.png
trunk/skin/ETI/images/icons without capsules/web.png
trunk/skin/ETI/images/icons without capsules/ws_ecouter.png
trunk/skin/ETI/images/icons without capsules/ws_regarder.png
trunk/skin/ETI/images/menu/
trunk/skin/ETI/images/menu/3861-10450.png
trunk/skin/ETI/images/menu/3973-30398.png
trunk/skin/ETI/images/menu/4224-94092.png
trunk/skin/ETI/images/menu/4227-51054.png
trunk/skin/ETI/images/menu/Thumbs.db
trunk/skin/ETI/images/mini_icons/
trunk/skin/ETI/images/mini_icons/Thumbs.db
trunk/skin/ETI/images/mini_icons/audio.gif
trunk/skin/ETI/images/mini_icons/cinema.gif
trunk/skin/ETI/images/mini_icons/dvd.gif
trunk/skin/ETI/images/mini_icons/explorer.gif
trunk/skin/ETI/images/mini_icons/films.gif
trunk/skin/ETI/images/mini_icons/games.gif
trunk/skin/ETI/images/mini_icons/info.gif
trunk/skin/ETI/images/mini_icons/internet.gif
trunk/skin/ETI/images/mini_icons/media.gif
trunk/skin/ETI/images/mini_icons/music.gif
trunk/skin/ETI/images/mini_icons/nowplaying.gif
trunk/skin/ETI/images/mini_icons/photo.gif
trunk/skin/ETI/images/mini_icons/photos.gif
trunk/skin/ETI/images/mini_icons/record.gif
trunk/skin/ETI/images/mini_icons/settings.gif
trunk/skin/ETI/images/mini_icons/signet.gif
trunk/skin/ETI/images/mini_icons/weather.gif
trunk/skin/ETI/images/mini_icons/web.gif
trunk/skin/ETI/images/other/
trunk/skin/ETI/images/other/2925-93564.png
trunk/skin/ETI/images/other/Basket-ball.gif
trunk/skin/ETI/images/other/Football.gif
trunk/skin/ETI/images/other/Rugby.gif
trunk/skin/ETI/images/other/Thumbs.db
trunk/skin/ETI/images/other/Volley-ball.gif
trunk/skin/ETI/images/other/bordure_1-4.gif
trunk/skin/ETI/images/other/bordure_2-4.gif
trunk/skin/ETI/images/other/bordure_3-4.gif
trunk/skin/ETI/images/other/bordure_4-4.gif
trunk/skin/ETI/images/other/cadre.png
trunk/skin/ETI/images/other/cadre1.gif
trunk/skin/ETI/images/other/cadre2.gif
trunk/skin/ETI/images/other/cadre2.png
trunk/skin/ETI/images/other/cadre3.gif
trunk/skin/ETI/images/other/cancelled.gif
trunk/skin/ETI/images/other/disque_dur_30.gif
trunk/skin/ETI/images/other/disque_dur_35.gif
trunk/skin/ETI/images/other/dossier.gif
trunk/skin/ETI/images/other/encours.gif
trunk/skin/ETI/images/other/finished.gif
trunk/skin/ETI/images/other/meedio-icon.png
trunk/skin/ETI/images/other/mitemps.gif
trunk/skin/ETI/images/other/nocoverart.png
trunk/skin/ETI/images/other/puce.gif
trunk/skin/ETI/images/selection/
trunk/skin/ETI/images/selection/Thumbs.db
trunk/skin/ETI/images/selection/button_not_selected.png
trunk/skin/ETI/images/selection/button_selected.png
trunk/skin/ETI/images/selection/button_selected2 copie.gif
trunk/skin/ETI/images/selection/button_selected2 copie.png
trunk/skin/ETI/images/selection/button_selected2.png
trunk/skin/ETI/images/selection/button_selected3.png
trunk/skin/ETI/images/selection/folder_button_not_selected.png
trunk/skin/ETI/images/selection/folder_button_selected.png
trunk/skin/ETI/images/selection/selection_1.gif
trunk/skin/ETI/images/selection/selection_2.gif
trunk/skin/ETI/images/selection/selection_3.gif
trunk/skin/ETI/images/selection/selection_4.gif
trunk/skin/ETI/images/selection/thumbnail_button_not_selected.png
trunk/skin/ETI/images/selection/thumbnail_button_selected.png
trunk/skin/ETI/images/video/
trunk/skin/ETI/images/video/Info-back.png
trunk/skin/ETI/images/video/Thumbs.db
trunk/skin/ETI/images/video/button-background.png
trunk/skin/ETI/images/video/progressbar-back.png
trunk/skin/ETI/images/video/progressbar.png
trunk/skin/ETI/images/video/topbar-background.png
trunk/skin/ETI/interface/
trunk/skin/ETI/interface/Basket-ball.gif
trunk/skin/ETI/interface/Football.gif
trunk/skin/ETI/interface/HQ.gif
trunk/skin/ETI/interface/N.gif
trunk/skin/ETI/interface/Rugby.gif
trunk/skin/ETI/interface/Thumbs.db
trunk/skin/ETI/interface/Volley-ball.gif
trunk/skin/ETI/interface/aide.gif
trunk/skin/ETI/interface/ajouter.gif
trunk/skin/ETI/interface/anniv.gif
trunk/skin/ETI/interface/barre1.gif
trunk/skin/ETI/interface/barre2.gif
trunk/skin/ETI/interface/barre3.gif
trunk/skin/ETI/interface/bas.gif
trunk/skin/ETI/interface/blank.gif
trunk/skin/ETI/interface/boot.gif
trunk/skin/ETI/interface/btn_bleu.gif
trunk/skin/ETI/interface/btn_jaune.gif
trunk/skin/ETI/interface/btn_rouge.gif
trunk/skin/ETI/interface/btn_vert.gif
trunk/skin/ETI/interface/cancelled.gif
trunk/skin/ETI/interface/coeur.gif
trunk/skin/ETI/interface/delete.gif
trunk/skin/ETI/interface/done.gif
trunk/skin/ETI/interface/dossier_enregistrement.gif
trunk/skin/ETI/interface/dossier_nouvelle_programmation.gif
trunk/skin/ETI/interface/dossier_programme.gif
trunk/skin/ETI/interface/encours.gif
trunk/skin/ETI/interface/eteindre.gif
trunk/skin/ETI/interface/finished.gif
trunk/skin/ETI/interface/haut.gif
trunk/skin/ETI/interface/help.gif
trunk/skin/ETI/interface/heure_enregistrement.gif
trunk/skin/ETI/interface/hibernation.gif
trunk/skin/ETI/interface/home.gif
trunk/skin/ETI/interface/info.gif
trunk/skin/ETI/interface/information.gif
trunk/skin/ETI/interface/jouer.gif
trunk/skin/ETI/interface/logo.gif
trunk/skin/ETI/interface/mail.gif
trunk/skin/ETI/interface/mitemps.gif
trunk/skin/ETI/interface/noimage.gif
trunk/skin/ETI/interface/noir.jpg
trunk/skin/ETI/interface/ok.gif
trunk/skin/ETI/interface/pagination.gif
trunk/skin/ETI/interface/piecejointe.gif
trunk/skin/ETI/interface/player.gif
trunk/skin/ETI/interface/puce.gif
trunk/skin/ETI/interface/redemarrer.gif
trunk/skin/ETI/interface/star.gif
trunk/skin/ETI/interface/star0.gif
trunk/skin/ETI/interface/star1.gif
trunk/skin/ETI/interface/star2.gif
trunk/skin/ETI/interface/star3.gif
trunk/skin/ETI/interface/star4.gif
trunk/skin/ETI/interface/supall.gif
trunk/skin/ETI/interface/supaudio.gif
trunk/skin/ETI/interface/supphoto.gif
trunk/skin/ETI/interface/supvideo.gif
trunk/skin/ETI/interface/valider.gif
trunk/skin/ETI/interface/wait.gif
trunk/skin/ETI/interface/while.gif
trunk/skin/ETI/interface/whilekey.gif
trunk/skin/ETI/interface.tpl
trunk/skin/ETI/interface_audio.tpl
trunk/skin/ETI/lecture_now.tpl
trunk/skin/ETI/lib/
trunk/skin/ETI/menu.tpl
trunk/skin/ETI/option.tpl
trunk/skin/ETI/parametre/
trunk/skin/ETI/photo.tpl
trunk/skin/ETI/player/
trunk/skin/ETI/player/Thumbs.db
trunk/skin/ETI/player/r1_c1.gif
trunk/skin/ETI/player/r2_c1.gif
trunk/skin/ETI/player/r2_c9.gif
trunk/skin/ETI/player/r3_c1.gif
trunk/skin/ETI/player/r4_c1.gif
trunk/skin/ETI/player/r4_c3.gif
trunk/skin/ETI/player/r4_c4.gif
trunk/skin/ETI/player/r4_c6.gif
trunk/skin/ETI/player/r4_c7.gif
trunk/skin/ETI/player/r4_c8.gif
trunk/skin/ETI/player/r5_c1.gif
trunk/skin/ETI/playlist_audio.tpl
trunk/skin/ETI/vuedensemble.gif
Added: trunk/module/telesites/index1.php
===================================================================
--- trunk/module/telesites/index1.php (rev 0)
+++ trunk/module/telesites/index1.php 2007-05-28 20:03:19 UTC (rev 165)
@@ -0,0 +1,31 @@
+<?php
+$RACINE_REP = "../../";
+require($RACINE_REP.'_framework/framework.php');
+
+function parse_sites($xml){
+ $RES = array();
+ foreach($xml->xpath('/ts-freebox/telesite') as $telesite){
+ $RES[] = array('nom'=>$telesite->name,'url'=>$telesite->url,'weburl'=>$telesite->weburl,'category'=>$telesite->category,'screenshot'=>$telesite->screenshot);
+ }
+ return $RES;
+}
+
+$xml = simplexml_load_file_cache('http://www.freeplayer.org/telesite.xml',24);
+$sites = parse_sites($xml);
+
+
+if(isset($_GET['siteid'])){
+$base = $sites[$_GET['siteid']]['url'];
+$contenu = file_get_contents_cache($base.'index.php?'.$_SERVER['QUERY_STRING'],24);
+$contenu = str_replace('src="images/', 'src="'.$IMG2FBX.'?cache=1&img='.urlencode($base.'images/'), $contenu);
+
+echo $contenu;
+}else{
+$smarty->assign('xml',$xml);
+$smarty->assign('CONTENT',$smarty->fetch('telesite.tpl'));
+$smarty->display('interface.tpl');
+}
+
+
+
+?>
Added: trunk/module/telesites/telesite.tpl
===================================================================
--- trunk/module/telesites/telesite.tpl (rev 0)
+++ trunk/module/telesites/telesite.tpl 2007-05-28 20:03:19 UTC (rev 165)
@@ -0,0 +1,71 @@
+{if $FLUX==''}
+ {section name=liste loop=$RSS max=3 start=$MIN}
+ {if $smarty.section.liste.first}
+ {if $MIN!=0}
+ {assign var=temp value=$MIN-3}
+ {attribbouton touche="green" lien="index1.php?cat=$cat&min=$temp"}
+ <a href="index1.php?cat={$cat}&min={$temp}"><img src="{$INTERFACE_REP}btn_vert.gif" border="0"> Pr\xE9c\xE9dent</a>
+ {/if}
+ <table width="500" border="0" cellspacing="5" cellpadding="5" align="left" valign="top">
+ {/if}
+
+ <tr><td><a href="index1.php?cat={$cat}&feed={$RSS[liste].id}">
+ <table width="500" border="0" cellpadding="0" cellspacing="0" bgcolor="{#COULEUR_FOND1#}" abgcolor="{#COULEUR_TABLE_SELECTED#}">
+ <tr>
+ <td align="left" valign="top" width="120"><img width="120" height="90" src="{$IMG2FBX}?img={$RSS[liste].img|urlencode}&width=120&height=90&cache=1"></td>
+ <td align="left" valign="top" width="380"><b><u>{$RSS[liste].name|truncate:30}</u></b><br>{$RSS[liste].description|truncate:100}</td>
+ </tr>
+ </table>
+ </a></td></tr>
+
+ {if $smarty.section.liste.last}
+ </table>
+ {if $MIN+$smarty.section.liste.total < count($RSS)}
+ {assign var=temp value=$MIN+3}
+ {attribbouton touche="blue" lien="index1.php?cat=$cat&min=$temp"}
+ <a href="index1.php?cat={$cat}&min={$temp}"><img src="{$INTERFACE_REP}btn_bleu.gif" border="0"> Suivant</a>
+ {/if}
+ {/if}
+
+ {sectionelse}
+ Cette cat\xE9gorie ne contient aucun flux. Vous pouvez en ajouter depuis l'interface de configuration d'Easybox.
+ {/section}
+
+{else}
+ {section name=liste loop=$FLUX max=5 start=$MIN}
+ {if $smarty.section.liste.first}
+ {if $MIN!=0}
+ {assign var=temp value=$MIN-5}
+ {assign var=temp2 value=$cat.id}
+ {assign var=temp3 value=$feed.id}
+ {attribbouton touche="green" lien="index1.php?cat=$temp2&feed=$temp3&min=$temp"}
+ <a href="index1.php?cat={$cat.id}&feed={$feed.id}&min={$temp}"><img src="{$INTERFACE_REP}btn_vert.gif" border="0"> Pr\xE9c\xE9dent</a>
+ {/if}
+ <table width="500" border="0" cellspacing="7" cellpadding="7" align="left" valign="top">
+ {/if}
+
+
+ <tr><td>{if $FLUX[liste].description!=''}<a href="index1.php?cat={$cat.id}&feed={$feed.id}&post={$FLUX[liste].id}">{/if}
+ <table width="500" border="0" cellpadding="0" cellspacing="0" bgcolor="{#COULEUR_FOND1#}" abgcolor="{#COULEUR_TABLE_SELECTED#}">
+ <tr>
+ <td align="left" valign="top"><b><u>{$FLUX[liste].titre}</u></b>{if $FLUX[liste].description!=''} : {$FLUX[liste].description|truncate:50}{/if}</td>
+ </tr>
+ </table>
+ {if $FLUX[liste].description!=''}</a>{/if}</td></tr>
+
+ {if $smarty.section.liste.last}
+ </table><br>
+ {if $MIN+$smarty.section.liste.total < count($FLUX)}
+ {assign var=temp value=$MIN+5}
+ {assign var=temp2 value=$cat.id}
+ {assign var=temp3 value=$feed.id}
+ {attribbouton touche="blue" lien="index1.php?cat=$temp2&feed=$temp3&min=$temp"}
+ <a href="index1.php?cat={$cat.id}&feed={$feed.id}&min={$temp}"><img src="{$INTERFACE_REP}btn_bleu.gif" border="0"> Suivant</a>
+ {/if}
+ {/if}
+
+ {sectionelse}
+ Ce flux ne contient aucun \xE9l\xE9ment.
+ {/section}
+
+{/if}
Added: trunk/skin/ETI/chaines/2MMaroc.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/2MMaroc.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/AB1.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/AB1.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/ABMoteurs.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/ABMoteurs.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/AlJazeera.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/AlJazeera.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/AlJazeeraChildren.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/AlJazeeraChildren.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/AlMasriya.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/AlMasriya.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/ArmeniaTV.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/ArmeniaTV.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/Arte.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/Arte.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/ArteAllemand.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/ArteAllemand.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/AstroCenterTV.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/AstroCenterTV.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/BFMTV.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/BFMTV.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/Bestofshopping.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/Bestofshopping.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/BloombergTV.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/BloombergTV.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/BulgariaTv.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/BulgariaTv.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/CANAL+.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/CANAL+.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/DW-TV.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/DW-TV.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/Demain_.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/Demain_.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/Direct8.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/Direct8.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/Euronews.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/Euronews.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/Europe2TV.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/Europe2TV.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/FashionTV.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/FashionTV.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/France2.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/France2.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/France3.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/France3.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/France4.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/France4.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/France5.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/France5.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/Franceo.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/Franceo.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/FreenewsTV.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/FreenewsTV.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/FunTV.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/FunTV.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/GameOne.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/GameOne.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/GodTV.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/GodTV.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/Image2.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/Image2.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/KTO.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/KTO.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/Kanal7INT.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/Kanal7INT.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/L'?\195?\169quipeTV.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/L'?\195?\169quipeTV.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/L'Equipetv.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/L'Equipetv.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/LaChaineMarseille.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/LaChaineMarseille.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/LaChaineParlementaire.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/LaChaineParlementaire.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/Lalocale.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/Lalocale.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/LibertyTV.com.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/LibertyTV.com.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/M6Boutique.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/M6Boutique.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/M6Musicblack.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/M6Musicblack.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/M6Musichits.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/M6Musichits.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/M6Musicrock.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/M6Musicrock.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/MTVFrance.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/MTVFrance.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/MireFREEBOX.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/MireFREEBOX.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/Motorstv.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/Motorstv.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/NRJ12.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/NRJ12.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/NRJ125.1.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/NRJ125.1.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/NRJ12Stereo.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/NRJ12Stereo.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/NT1.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/NT1.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/NormandieTV.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/NormandieTV.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/PhoenixChineseNewsandEntertainment.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/PhoenixChineseNewsandEntertainment.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/RTL9.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/RTL9.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/RTMMaroc.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/RTMMaroc.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/RTPi.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/RTPi.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/RTRPlaneta.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/RTRPlaneta.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/RaiDue.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/RaiDue.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/RaiTre.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/RaiTre.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/RaiUno.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/RaiUno.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/RealMadridTV.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/RealMadridTV.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/SamanyoluTV.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/SamanyoluTV.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/SkyNews.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/SkyNews.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/SkyNewsInternational.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/SkyNewsInternational.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/TRTINT.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/TRTINT.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/TV5.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/TV5.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/TV7Bordeaux.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/TV7Bordeaux.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/TV7Tunisia.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/TV7Tunisia.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/TV8Mont-Blanc.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/TV8Mont-Blanc.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/TVEInternational.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/TVEInternational.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/TVPolonia.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/TVPolonia.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/TVRomania.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/TVRomania.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/TeleGrenoble.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/TeleGrenoble.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/Telenantes_Nantes7.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/Telenantes_Nantes7.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/Teleplaisance.org.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/Teleplaisance.org.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/Thumbs.db
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/Thumbs.db
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/W9.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/W9.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/adjaraTV.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/adjaraTV.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/beurtv.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/beurtv.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/canalalgerie.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/canalalgerie.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/canalplus.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/canalplus.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/cctv4.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/cctv4.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/cnbc.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/cnbc.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/cnbceurope.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/cnbceurope.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/demain.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/demain.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/etbSat.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/etbSat.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/freenews.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/freenews.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/gulli.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/gulli.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/iTELE.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/iTELE.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/moteur.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/moteur.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/mtv.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/mtv.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/t.tv.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/t.tv.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/telif.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/telif.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/tf1.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/tf1.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/tfj.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/tfj.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/tlm.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/tlm.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/tlt.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/tlt.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/chaines/zik.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/ETI/chaines/zik.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skin/ETI/couleur.conf
===================================================================
--- trunk/skin/ETI/couleur.conf (rev 0)
+++ trunk/skin/ETI/couleur.conf 2007-05-28 20:03:19 UTC (rev 165)
@@ -0,0 +1,63 @@
+<?php
+
+titre ='Easybox'
+max_ligne_mini_menu ='3'
+max_ligne_liste ='9'
+
+#Couleur du text par defaud
+COULEUR_TEXT = "#FFFFFF3F"
+
+#Couleur des liens inactif
+COULEUR_LINK = "#FFFFFF3F"
+
+#Couleur des liens selectionne
+COULEUR_ALINK = "#95C6593F"
+
+#Couleur des liens deja visit\xE9
+COULEUR_VLINK = "#95C6593F"
+
+
+#Couleur du menu normal
+MENU_NORMAL = '#7E9AC225'
+
+#Couleur du menu s\xE9lectionne
+MENU_SELECT = '#95C65925'
+
+#Couleur du Titre Principal
+TITRE_1 ='#FFFFFF3F'
+
+#Couleur du Sous-Titre
+SS_TITRE ='#C4FF733F'
+
+#Couleur du fond avertissement
+COULEUR_FOND_AVERTISSEMENT='#7E9AC215'
+
+COULEUR_INTERFACE1 = "#3482E015"
+COULEUR_INTERFACE2 = "#82B1EC20"
+
+
+white ='#FFFFFF3F'
+black ='#0000003F'
+
+
+COULEUR_FOND ='#7E9AC235'
+COULEUR_FOND2 ='#7E9AC225'
+
+COULEUR_TABLE_SELECTED = '#95C65925'
+
+#Couleur du text par defaud DVD
+COULEUR_DVD_TEXT = "#FFFFFF3F"
+
+#Couleur des liens inactif
+COULEUR_DVD_LINK = "#FFFFFF3F"
+
+#Couleur des liens selectionne
+COULEUR_DVD_ALINK = "#95C6593F"
+
+#Couleur des liens deja visite
+COULEUR_DVD_VLINK = "#95C6593F"
+
+#///////////////////////////////// Fond d'\xE9cran ///////////////////////////////////
+BACKGROUND = "background.png"
+TYPE = "int"
+?>
Added: trunk/skin/ETI/demarrage.tpl
===================================================================
--- trunk/skin/ETI/demarrage.tpl (rev 0)
+++ trunk/skin/ETI/demarrage.tpl 2007-05-28 20:03:19 UTC (rev 165)
@@ -0,0 +1,36 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
+<html>
+<head>
+{include file="bouton.tpl"}
+{if etape==1}<flags wait_new_picture=true>{/if}
+</head>
+<body background="ts://127.0.0.1" text="{#COULEUR_TEXT#}" link="{#COULEUR_LINK#}" alink="{#COULEUR_ALINK#}" vlink="{#COULEUR_VLINK#}">
+
+<center><table width="590" border="0" align="center" cellpadding="0" cellspacing="0"><tr><td align=center valign="middle" colspan="2">
+<img src="{$INTERFACE_REP}boot.gif" w...
[truncated message content] |
|
From: <ara...@us...> - 2007-06-02 09:44:53
|
Revision: 173
http://svn.sourceforge.net/easybox-mod/?rev=173&view=rev
Author: aragornis
Date: 2007-06-02 02:44:51 -0700 (Sat, 02 Jun 2007)
Log Message:
-----------
Petite correction sur la modif de nux : l'assignation smarty se fait trop tot ! Est-ce que ca marche toujours pour le skin mediacenter ?
Modified Paths:
--------------
trunk/_framework/framework.php
trunk/_utilisateur/multiposte.m3u
Modified: trunk/_framework/framework.php
===================================================================
--- trunk/_framework/framework.php 2007-06-01 14:45:15 UTC (rev 172)
+++ trunk/_framework/framework.php 2007-06-02 09:44:51 UTC (rev 173)
@@ -18,7 +18,6 @@
require_once($LIBRARIES_REP.'/Smarty.class.php');
$smarty = new Smarty();
- $smarty->assign('vers_fbx',$vers_fbx);
$smarty->assign('FRAMEWORK_REP',$FRAMEWORK_REP);
$smarty->assign('RACINE_REP',$RACINE_REP);
$smarty->assign('LIBRARIES_REP',$LIBRARIES_REP);
@@ -55,8 +54,9 @@
require_once($LOAD);
// version de freebox
$info_fbx=fbx_GetBoxUserAgent();
- $vers_fbx =$info_fbx['version'];
-
+ $vers_fbx =$info_fbx['version'];
+ $smarty->assign('vers_fbx',$vers_fbx);
+
$EXPLORATEUR = $MODULE.'_explorateur/index1.php';
$smarty->assign('EXPLORATEUR',$EXPLORATEUR);
$PLAYLIST = $USER.'playlist/';
Modified: trunk/_utilisateur/multiposte.m3u
===================================================================
--- trunk/_utilisateur/multiposte.m3u 2007-06-01 14:45:15 UTC (rev 172)
+++ trunk/_utilisateur/multiposte.m3u 2007-06-02 09:44:51 UTC (rev 173)
@@ -51,6 +51,10 @@
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=496
#EXTINF:0,31 - Game One
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=220
+#EXTINF:0,32 - Nolife
+rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=658
+#EXTINF:0,34 - TFOU
+rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=615
#EXTINF:0,36 - Mangas
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=253
#EXTINF:0,37 - MCM
@@ -151,6 +155,8 @@
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=235
#EXTINF:0,95 - 3A Telesud
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=356
+#EXTINF:0,96 - National Geographic HD
+rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=214
#EXTINF:0,97 - Luxe.TV
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=460
#EXTINF:0,98 - Freenews TV
@@ -165,6 +171,8 @@
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=358
#EXTINF:0,131 - M6 Boutique
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=359
+#EXTINF:0,132 - Cash TV
+rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=492
#EXTINF:0,133 - Astro Center TV
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=415
#EXTINF:0,150 - TLM
@@ -425,37 +433,37 @@
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,602 - France 2 (h264)
+#EXTINF:0,602 - France 2 (bas debit)
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=625
-#EXTINF:0,603 - France 3 (h264)
+#EXTINF:0,603 - France 3 (bas debit)
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=626
-#EXTINF:0,605 - France 5 (h264)
+#EXTINF:0,605 - France 5 (bas debit)
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=627
-#EXTINF:0,606 - M6 (h264)
+#EXTINF:0,606 - M6 (bas debit)
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=628
-#EXTINF:0,607 - Arte (h264)
+#EXTINF:0,607 - Arte (bas debit)
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=629
-#EXTINF:0,608 - Direct 8 (h264)
+#EXTINF:0,608 - Direct 8 (bas debit)
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=630
-#EXTINF:0,609 - W9 (h264)
+#EXTINF:0,609 - W9 (bas debit)
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=631
-#EXTINF:0,610 - TMC (h264)
+#EXTINF:0,610 - TMC (bas debit)
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=632
-#EXTINF:0,611 - NT1 (h264)
+#EXTINF:0,611 - NT1 (bas debit)
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=633
-#EXTINF:0,612 - NRJ 12 (h264)
+#EXTINF:0,612 - NRJ 12 (bas debit)
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=634
-#EXTINF:0,613 - La Chaîne Parlementaire (h264)
+#EXTINF:0,613 - La Chaîne Parlementaire (bas debit)
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=635
-#EXTINF:0,614 - France 4 (h264)
+#EXTINF:0,614 - France 4 (bas debit)
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=636
-#EXTINF:0,615 - BFM TV (h264)
+#EXTINF:0,615 - BFM TV (bas debit)
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=637
-#EXTINF:0,616 - i>TELE (h264)
+#EXTINF:0,616 - i>TELE (bas debit)
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=638
-#EXTINF:0,617 - Europe 2 TV (h264)
+#EXTINF:0,617 - Europe 2 TV (bas debit)
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=639
-#EXTINF:0,618 - Gulli (h264)
+#EXTINF:0,618 - Gulli (bas debit)
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=640
#EXTINF:0,10001 - Europe 1
#EXTVLCOPT:ts-es-id-pid
@@ -692,7 +700,7 @@
#EXTVLCOPT:no-video
#EXTVLCOPT:audio-track-id=1007
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=110049
-#EXTINF:0,10050 - Sun FM Nantes
+#EXTINF:0,10050 - 1onAir Connect
#EXTVLCOPT:ts-es-id-pid
#EXTVLCOPT:no-video
#EXTVLCOPT:audio-track-id=1002
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ara...@us...> - 2007-06-02 12:44:33
|
Revision: 174
http://svn.sourceforge.net/easybox-mod/?rev=174&view=rev
Author: aragornis
Date: 2007-06-02 05:44:30 -0700 (Sat, 02 Jun 2007)
Log Message:
-----------
Cette version de la d?\195?\169tection de la version de la fbx doit, enfin, etre fonctionnelle !
Modified Paths:
--------------
trunk/_framework/fonctions_partagees.inc.php
trunk/_framework/framework.php
trunk/module/telesites/index1.php
Modified: trunk/_framework/fonctions_partagees.inc.php
===================================================================
--- trunk/_framework/fonctions_partagees.inc.php 2007-06-02 09:44:51 UTC (rev 173)
+++ trunk/_framework/fonctions_partagees.inc.php 2007-06-02 12:44:30 UTC (rev 174)
@@ -1,6 +1,7 @@
<?php
function fbx_GetBoxUserAgent()
{
+global $HTTP_SERVER_VARS;
// Analyse le user_agent de la box
// Le firmware peut \xEAtre dans le format :
// freebox/1.0.0 (hw:5.0; sw:1.2.1) ifc:12345678901
@@ -10,26 +11,26 @@
if (isset($HTTP_SERVER_VARS['HTTP_X_BOX_USER_AGENT'])) $userboxagent =
$HTTP_SERVER_VARS['HTTP_X_BOX_USER_AGENT'];
- if (isset($HTTP_SERVER_VARS['HTTP_BOX_USER_AGENT'])) $userboxagent =
- $HTTP_SERVER_VARS['HTTP_BOX_USER_AGENT'];
-
+ if (isset($HTTP_SERVER_VARS['HTTP_USER_AGENT'])) $userboxagent =
+ $HTTP_SERVER_VARS['HTTP_USER_AGENT'];
+
if (isset($userboxagent))
{
+
// Nouveau format de useragent
- if (preg_match('/(.*)\/(.*) \(hw:(.*); sw:(.*)\) ifc:(.*)/', $box_user_agent, $regs))
+ if (preg_match('/(.*)\/(.*) \(hw:(.*); sw:(.*)\) ifc:(.) canal_dep:(.)/', $userboxagent, $regs))
{
$boxinfo['name'] = $regs[1];
- $boxinfo['version'] = $regs[2];
- $boxinfo['firmware'] = $regs[3];
- $boxinfo['browser_version'] = $regs[4];
+ $boxinfo['version'] = intval($regs[3]);
+ $boxinfo['firmware'] = $regs[4];
+ $boxinfo['browser_version'] = $regs[2];
$boxinfo['ifc'] = $regs[5];
}
else
{
preg_match('/(.*)\/(.*)/', $box_user_agent, $regs);
-
$boxinfo['name'] = $regs[1];
- $boxinfo['version'] = "x.x";
+ $boxinfo['version'] = 3;
$boxinfo['firmware'] = $regs[2];
$boxinfo['browser_version'] = "#";
$boxinfo['ifc'] = "#";
Modified: trunk/_framework/framework.php
===================================================================
--- trunk/_framework/framework.php 2007-06-02 09:44:51 UTC (rev 173)
+++ trunk/_framework/framework.php 2007-06-02 12:44:30 UTC (rev 174)
@@ -53,9 +53,10 @@
$LOAD = $FRAMEWORK_REP.'fonctions_partagees.inc.php';
require_once($LOAD);
// version de freebox
- $info_fbx=fbx_GetBoxUserAgent();
- $vers_fbx =$info_fbx['version'];
+ $info_fbx = fbx_GetBoxUserAgent();
+ $vers_fbx = $info_fbx['version'];
$smarty->assign('vers_fbx',$vers_fbx);
+ file_put_contents($RACINE_REP.'log.txt',"\r\n".$HTTP_SERVER_VARS['HTTP_USER_AGENT']);
$EXPLORATEUR = $MODULE.'_explorateur/index1.php';
$smarty->assign('EXPLORATEUR',$EXPLORATEUR);
Modified: trunk/module/telesites/index1.php
===================================================================
--- trunk/module/telesites/index1.php 2007-06-02 09:44:51 UTC (rev 173)
+++ trunk/module/telesites/index1.php 2007-06-02 12:44:30 UTC (rev 174)
@@ -26,12 +26,21 @@
if(isset($_GET['siteid'])){
ini_set('user_agent', "EasyBox 4.1.2\r\nX-Box-User-Agent: freebox/1.0.0 (hw:4.0; sw:1.8.0)");
-$base = $sites[$_GET['siteid']]['url'];
+if(isset($_GET['url'])){
+ $base = urldecode($_GET['url']);
+}else{
+ $base = $sites[$_GET['siteid']]['url'];
+}
+
$contenu = file_get_contents($base);
-$contenu = str_replace('src="images/', 'src="'.$IMG2FBX.'?cache=1&img='.urlencode($base.'images/'), $contenu);
+$info_url = ParseURLplus($base);
+
+
+$contenu = preg_replace('/href="(.{1,300})"/se', "'href=\"index1.php?siteid={$_GET['siteid']}&url='.urlencode('http://{$info_url['host']}').stripslashes('$1').'\"';", $contenu);
+$contenu = preg_replace('/src="(.{1,300})"/se', "'src=\"{$IMG2FBX}?cache=1&img='.urlencode('http://{$info_url['host']}').'$1'.'\"';", $contenu);
$contenu = str_replace('</body>', '<script language="javascript" src="/fb2ie.js"></script></body>', $contenu);
-$ereg = '<contentInfo>(.{1,800})<\/contentInfo>';
+$ereg = '<source>(.{1,800})<\/source>';
preg_match("/$ereg/s", $contenu, $valeur);
$commandes = $valeur[1];
@@ -41,10 +50,14 @@
$xml = simplexml_load_string($commandes);
$xml2 = simplexml_load_string($commandes2);
-$res = $xml->xpath('/hj:imageInfo/source/url');
+if($res = @$xml->xpath('/url')){
+ play_fichier('type=20&temps=8000',$res[0],0,'photo');
+}
$res2 = $xml2->xpath('/backgroundContent/settings');
$forcerimage = $res2[0]['stopCurrentlyPlaying'];
+
+
echo $contenu;
}else{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cra...@us...> - 2007-06-04 00:08:40
|
Revision: 179
http://svn.sourceforge.net/easybox-mod/?rev=179&view=rev
Author: craftsnux
Date: 2007-06-03 17:08:34 -0700 (Sun, 03 Jun 2007)
Log Message:
-----------
Utilisation de img2fbx pour afficher les jaquettes. suite...
Modified Paths:
--------------
trunk/module/mp3/lecteuraudio.php
trunk/module/mp3/playlist_audio.tpl
trunk/skin/ETI/audio.tpl
trunk/skin/ETI/interface.tpl
trunk/skin/ETI/lecture_now.tpl
trunk/skin/mediacenter/audio.tpl
Modified: trunk/module/mp3/lecteuraudio.php
===================================================================
--- trunk/module/mp3/lecteuraudio.php 2007-06-03 23:42:39 UTC (rev 178)
+++ trunk/module/mp3/lecteuraudio.php 2007-06-04 00:08:34 UTC (rev 179)
@@ -14,7 +14,7 @@
}
if (count($fichierimg)=="0"){
- if($Info!='' && $pagerecherche = file_get_contents('http://images.google.fr/images?q='.urlencode($Info))){
+ if($Info!='' && $pagerecherche = file_get_contents('http://images.google.fr/images?q='.urlencode(trim($Info)))){
$ereg = '\/images\?q=(.{1,25}):\/\/(.{1,75}) width';
$ereg = 'dyn.Img\("(.{0,200})","","(.{0,20})","(.{0,90})","(.{0,4})","(.{0,4})","(.{0,110})","","","(.{5,28})","jpg","(.{5,150})","","","(.{25,30})"\);';
@@ -333,8 +333,12 @@
$smarty->assign('info',$info);
}
-
-$jaquette=jaquette(urlencode(dirname($VLC['url_current'])),$VLC['type_current'],urlencode(trim($search)));
+if ($VLC['type_current']=='webradio'){
+$jaquette=jaquette(urlencode(dirname($VLC['url_current'])),$VLC['type_current'],urlencode(trim(get_variable('lastwebradio'))));
+}
+else{
+$jaquette=jaquette(urlencode(dirname($VLC['url_current'])),$VLC['type_current'],urlencode(trim($search)));
+}
$smarty->assign('jaquette',$jaquette);
if($mode=='pla'){
Modified: trunk/module/mp3/playlist_audio.tpl
===================================================================
--- trunk/module/mp3/playlist_audio.tpl 2007-06-03 23:42:39 UTC (rev 178)
+++ trunk/module/mp3/playlist_audio.tpl 2007-06-04 00:08:34 UTC (rev 179)
@@ -1,7 +1,7 @@
{if $VLC.type_current=='webradio' AND $VLC.etat!='stop'}
- <center><font size=3><u>Vous lisez actuellement la station de radio</font><br><font size=4>{$lastwebradio}</u></font><br><img src="jaquette.php?directory=&info={$lastwebradio|trim|urlencode}&w=400&h=250"></center>
+ <center><font size=3><u>Vous lisez actuellement la station de radio</font><br><font size=4>{$lastwebradio}</u></font><br><img src="{$IMG2FBX}?width=250&height=400&img={$jaquette}"></center>
{elseif $VLC.db_current_type=='podcast' AND $VLC.etat!='stop'}
<font size=3><center><u>Podcast en cours de lecture</u></font></center><br> <br>
Modified: trunk/skin/ETI/audio.tpl
===================================================================
--- trunk/skin/ETI/audio.tpl 2007-06-03 23:42:39 UTC (rev 178)
+++ trunk/skin/ETI/audio.tpl 2007-06-04 00:08:34 UTC (rev 179)
@@ -121,7 +121,7 @@
{if $VLC.etat!='stop'}
<td bgcolor="{#COULEUR_FOND#}" width="70" height="73">
- <img width="80" height="80" src="jaquette.php?directory={$VLC.url_current|dirname|urlencode}&lec={$VLC.type_current}&info={$search|trim|urlencode}">
+ <img width="80" height="80" src="{$IMG2FBX}?local=1&width=80&height=80&img={$jaquette}">
</td>
{/if}
Modified: trunk/skin/ETI/interface.tpl
===================================================================
--- trunk/skin/ETI/interface.tpl 2007-06-03 23:42:39 UTC (rev 178)
+++ trunk/skin/ETI/interface.tpl 2007-06-04 00:08:34 UTC (rev 179)
@@ -85,7 +85,7 @@
<tr>
<td width="100" height="94" align="center" valign="middle">
{if $VLC.etat!='stop' AND $smarty.server.SCRIPT_NAME=="/module/mp3/lecteuraudio.php"}
- <img width="70" height="70" src="jaquette.php?directory={$VLC.url_current|dirname|urlencode}&lec={$lec}&info={$search|trim|urlencode}">
+ <img width="70" height="70" src="{$IMG2FBX}?local=1&width=70&height=70&img={$jaquette}">
{else}
<img src="{$RACINE_REP}{$SKIN_REP}images/icons/{$LOGO_IMAGES}" width="70" height="70" border="0" />
{/if}
Modified: trunk/skin/ETI/lecture_now.tpl
===================================================================
--- trunk/skin/ETI/lecture_now.tpl 2007-06-03 23:42:39 UTC (rev 178)
+++ trunk/skin/ETI/lecture_now.tpl 2007-06-04 00:08:34 UTC (rev 179)
@@ -1,6 +1,6 @@
<table width="188" height="31" border="0" cellpadding="0" cellspacing="0">
<tr>
- <td rowspan="4"><img width="31" height="31" src="jaquette.php?directory={$VLC.url_current|dirname|urlencode}&lec={$lec}&info={$search|trim|urlencode}"></td>
+ <td rowspan="4"><img width="31" height="31" src="{$IMG2FBX}?local=1&width=31&height=31&img={$jaquette}"></td>
<td>
{if $informations[0].1}
<font size="1">{$informations[0].1|truncate:45:''}</font>
Modified: trunk/skin/mediacenter/audio.tpl
===================================================================
--- trunk/skin/mediacenter/audio.tpl 2007-06-03 23:42:39 UTC (rev 178)
+++ trunk/skin/mediacenter/audio.tpl 2007-06-04 00:08:34 UTC (rev 179)
@@ -121,7 +121,7 @@
{if $VLC.etat!='stop'}
<td bgcolor="{#COULEUR_FOND#}" width="70" height="73">
- <img width="80" height="80" src="jaquette.php?directory={$VLC.url_current|dirname|urlencode}&lec={$VLC.type_current}&info={$search|trim|urlencode}">
+ <img width="80" height="80" src="{$IMG2FBX}?local=1&width=80&height=80&img={$jaquette}">
</td>
{/if}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ara...@us...> - 2007-07-06 09:15:26
|
Revision: 180
http://svn.sourceforge.net/easybox-mod/?rev=180&view=rev
Author: aragornis
Date: 2007-07-06 02:15:22 -0700 (Fri, 06 Jul 2007)
Log Message:
-----------
Diverses modifs
Modified Paths:
--------------
trunk/_framework/framework.php
trunk/_utilisateur/modules.db
trunk/_utilisateur/multiposte.m3u
trunk/http-vlc/lecteur/set_option.html
trunk/module/clips/clips.tpl
trunk/module/dailymotion/dailymotion.tpl
trunk/module/films/films.tpl
trunk/module/telesites/index1.php
trunk/module/youtube/index1.php
trunk/module/youtube/youtube.tpl
trunk/skin/mediacenter/films.tpl
trunk/skin/simple/interface.tpl
Added Paths:
-----------
trunk/module/telesites/icone.gif
trunk/ressources/icones/Radioblogclub.gif
trunk/ressources/icones/Telesites.gif
Modified: trunk/_framework/framework.php
===================================================================
--- trunk/_framework/framework.php 2007-06-04 00:08:34 UTC (rev 179)
+++ trunk/_framework/framework.php 2007-07-06 09:15:22 UTC (rev 180)
@@ -56,7 +56,6 @@
$info_fbx = fbx_GetBoxUserAgent();
$vers_fbx = $info_fbx['version'];
$smarty->assign('vers_fbx',$vers_fbx);
- file_put_contents($RACINE_REP.'log.txt',"\r\n".$HTTP_SERVER_VARS['HTTP_USER_AGENT']);
$EXPLORATEUR = $MODULE.'_explorateur/index1.php';
$smarty->assign('EXPLORATEUR',$EXPLORATEUR);
Modified: trunk/_utilisateur/modules.db
===================================================================
(Binary files differ)
Modified: trunk/_utilisateur/multiposte.m3u
===================================================================
--- trunk/_utilisateur/multiposte.m3u 2007-06-04 00:08:34 UTC (rev 179)
+++ trunk/_utilisateur/multiposte.m3u 2007-07-06 09:15:22 UTC (rev 180)
@@ -15,14 +15,10 @@
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=373
#EXTINF:0,10 - TMC
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=497
-#EXTINF:0,11 - NT1
-rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=374
#EXTINF:0,12 - NRJ 12 5.1
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=381
#EXTINF:0,12 - NRJ 12 Stéréo
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=382
-#EXTINF:0,13 - La Chaîne Parlementaire
-rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=226
#EXTINF:0,14 - France 4
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=376
#EXTINF:0,15 - BFM TV
@@ -41,12 +37,14 @@
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=210
#EXTINF:0,22 - AB 1
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=211
-#EXTINF:0,23 - TV5
-rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=206
+#EXTINF:0,23 - NT1
+rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=374
#EXTINF:0,24 - France ô
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=238
#EXTINF:0,25 - RTBF Sat
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=448
+#EXTINF:0,26 - TV5
+rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=206
#EXTINF:0,27 - JET
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=496
#EXTINF:0,31 - Game One
@@ -111,6 +109,8 @@
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=618
#EXTINF:0,66 - Real Madrid TV
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=387
+#EXTINF:0,68 - La Chaîne Parlementaire
+rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=226
#EXTINF:0,69 - Euronews
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=205
#EXTINF:0,70 - Bloomberg TV
Modified: trunk/http-vlc/lecteur/set_option.html
===================================================================
--- trunk/http-vlc/lecteur/set_option.html 2007-06-04 00:08:34 UTC (rev 179)
+++ trunk/http-vlc/lecteur/set_option.html 2007-07-06 09:15:22 UTC (rev 180)
@@ -3,4 +3,5 @@
<vlc id="rpn" param1="'' 'audio-language' vlc_config_set"/>
<vlc id="rpn" param1="'-1' 'clock-synchro' vlc_config_set"/>
<vlc id="rpn" param1="'2' 'avi-index' vlc_config_set"/>
+ <vlc id="rpn" param1="'0' 'play-and-stop' vlc_config_set"/>
<vlc id="rpn" param1="vlc_config_save" />
Modified: trunk/module/clips/clips.tpl
===================================================================
--- trunk/module/clips/clips.tpl 2007-06-04 00:08:34 UTC (rev 179)
+++ trunk/module/clips/clips.tpl 2007-07-06 09:15:22 UTC (rev 180)
@@ -72,5 +72,5 @@
<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.
+La touche {literal}#{/literal} permet de changer entre les minuscules/majuscules et les chiffres. Cette fonction n'est pas disponible pour l'instant pour les non d\xE9group\xE9s.
{/if}
Modified: trunk/module/dailymotion/dailymotion.tpl
===================================================================
--- trunk/module/dailymotion/dailymotion.tpl 2007-06-04 00:08:34 UTC (rev 179)
+++ trunk/module/dailymotion/dailymotion.tpl 2007-07-06 09:15:22 UTC (rev 180)
@@ -34,5 +34,5 @@
<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.
+La touche {literal}#{/literal} permet de changer entre les minuscules/majuscules et les chiffres. Cette fonction n'est pas disponible pour l'instant pour les non d\xE9group\xE9s.
{/if}
Modified: trunk/module/films/films.tpl
===================================================================
--- trunk/module/films/films.tpl 2007-06-04 00:08:34 UTC (rev 179)
+++ trunk/module/films/films.tpl 2007-07-06 09:15:22 UTC (rev 180)
@@ -36,20 +36,33 @@
{/foreach}
</select>
<br>Post-traitement :
-<select name="pp">
-<option value=0 {if $pp_video==1}selected{/if}>0
+{if $vers_fbx==5}
+<select name="pp" bgcolor="{#COULEUR_FOND_RADIO#}">
+<option value=0 {if $pp_video==0}selected{/if}>0
<option value=1 {if $pp_video==1}selected{/if}>1
<option value=2 {if $pp_video==2}selected{/if}>2
<option value=3 {if $pp_video==3}selected{/if}>3
<option value=4 {if $pp_video==4}selected{/if}>4
<option value=5 {if $pp_video==5}selected{/if}>5
<option value=6 {if $pp_video==6}selected{/if}>6
-</select><br>
+</select>
+{else}
+<table width="280" align="left">
+<tr><td width="40">0</td><td><input type=radio bgcolor="{#COULEUR_FOND_RADIO#}" name=pp value=0></td></tr>
+<tr><td width="40">1</td><td><input type=radio bgcolor="{#COULEUR_FOND_RADIO#}" name=pp value=1></td></tr>
+<tr><td width="40">2</td><td><input type=radio bgcolor="{#COULEUR_FOND_RADIO#}" name=pp value=2></td></tr>
+<tr><td width="40">3</td><td><input type=radio bgcolor="{#COULEUR_FOND_RADIO#}" name=pp value=3></td></tr>
+<tr><td width="40">4</td><td><input type=radio bgcolor="{#COULEUR_FOND_RADIO#}" name=pp value=4></td></tr>
+<tr><td width="40">5</td><td><input type=radio bgcolor="{#COULEUR_FOND_RADIO#}" name=pp value=5></td></tr>
+<tr><td width="40">6</td><td><input type=radio bgcolor="{#COULEUR_FOND_RADIO#}" name=pp value=6></td></tr>
+</table>
+{/if}
- Augmenter la qualit\xE9 du traitement de l'image (de 0 vers 6) demande plus de puissance CPU.
- <br>
+<br>
+Augmenter la qualit\xE9 du traitement de l'image (de 0 vers 6) demande plus de puissance CPU.
+<br>
-<table width="500" align="left">
+<table width="360" 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>
<tr><td width="90">Couleur</td><td width="5">:</td><td><input bgcolor="{#COULEUR_FOND_RADIO#}" type=hslider name=denc_saturation min=0 max=255 grad=16></td></tr>
@@ -57,19 +70,26 @@
</table>
{if $vers_fbx==5}
-<select name=display_scaling>
+Format : <select name=display_aspect_ratio bgcolor="{#COULEUR_FOND_RADIO#}">
+<option value=0/0>Auto
+<option value=16/9>16/9
+<option value=4/3>4/3
+</select>
+<br>
+Mode de conversion : <select name=display_scaling bgcolor="{#COULEUR_FOND_RADIO#}">
<option value=letterbox>Letterbox
<option value=panscan>Panscan
<option value=fullscreen>Fullscreen
</select>
-<select name=display_aspect_ratio_conversion>
-<option value=letterbox>Letterbox
-<option value=combined>Combined
-<option value=panscan>Panscan
-<option value=ignore>Ignore
-</select>
{else}
-<table width="250" align="left">
+Aspect ratio :
+<table width="390" align="left">
+<tr><td width="130">Auto</td><td><input type=radio bgcolor="{#COULEUR_FOND_RADIO#}" name=display_aspect_ratio value=0/0></td></tr>
+<tr><td width="130">16/9</td><td><input type=radio bgcolor="{#COULEUR_FOND_RADIO#}" name=display_aspect_ratio value=16/9></td></tr>
+<tr><td width="130">4/3</td><td><input type=radio bgcolor="{#COULEUR_FOND_RADIO#}" name=display_aspect_ratio value=4/3></td></tr>
+</table>
+Mode de conversion :
+<table width="520" align="left">
<tr><td width="130">4/3 Letterbox</td><td><input type=radio bgcolor="{#COULEUR_FOND_RADIO#}" name=display_aspect_ratio_conversion value=letterbox></td></tr>
<tr><td width="130">4/3 Combined</td><td><input type=radio bgcolor="{#COULEUR_FOND_RADIO#}" name=display_aspect_ratio_conversion value=combined></td></tr>
<tr><td width="130">4/3 Pan Scan</td><td><input type=radio bgcolor="{#COULEUR_FOND_RADIO#}" name=display_aspect_ratio_conversion value=panscan></td></tr>
@@ -171,6 +191,8 @@
{/if}
<br>
+<a href="{$MODULE}films/lecture.php?control=faster">plus vite</a>
+<a href="{$MODULE}films/lecture.php?control=slower">moins vite</a>
<img src="{$INTERFACE_REP}btn_bleu.gif" border="0"> <a href="{$MODULE}films/info.php?module=navigation&savesignet=1">Ajouter un nouveau signet</a>
{/if}
Added: trunk/module/telesites/icone.gif
===================================================================
(Binary files differ)
Property changes on: trunk/module/telesites/icone.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/module/telesites/index1.php
===================================================================
--- trunk/module/telesites/index1.php 2007-06-04 00:08:34 UTC (rev 179)
+++ trunk/module/telesites/index1.php 2007-07-06 09:15:22 UTC (rev 180)
@@ -26,6 +26,43 @@
if(isset($_GET['siteid'])){
ini_set('user_agent', "EasyBox 4.1.2\r\nX-Box-User-Agent: freebox/1.0.0 (hw:4.0; sw:1.8.0)");
+switch($_GET['actionplayer']){
+case 'stop':
+ $file1 = file_get_contents('http://127.0.0.1:8081/lecteur/action.html?control=stop');
+ break;
+case 'pause':
+ $file1 = file_get_contents('http://127.0.0.1:8081/lecteur/action.html?control=pause');
+ break;
+case 'play':
+ $file1 = file_get_contents('http://127.0.0.1:8081/lecteur/action.html?control=play');
+ break;
+case 'next':
+ $file1 = file_get_contents('http://127.0.0.1:8081/lecteur/action.html?control=next');
+ break;
+case 'previous':
+ $file1 = file_get_contents('http://127.0.0.1:8081/lecteur/action.html?control=previous');
+ break;
+}
+
+switch($_GET['actionbrowser']){
+case 'previous':
+
+ break;
+case 'next':
+
+ break;
+case 'startPage':
+
+ break;
+case 'addBookmark':
+
+ break;
+case 'options':
+
+ break;
+}
+
+
if(isset($_GET['url'])){
$base = urldecode($_GET['url']);
}else{
@@ -45,11 +82,14 @@
return urlencode('http://'.$info_url['host'].$info_url['dir'].'/');
}
}
+
+
+$contenu = str_replace('hjbx://browserControl.do?cmd=', 'http://'.$info_url['host'].$info_url['path'].'&actionbrowser=', $contenu);
$contenu = preg_replace('/href="(.{1,100})">/se', "'href=\"index1.php?siteid={$_GET['siteid']}&url='.formaterurl('$1').str_replace('\\\\\\\\','','$1').'\">';", $contenu);
$contenu = preg_replace('/src="(.{1,300})(" \/>|">|"\/>)/se', "'src=\"{$IMG2FBX}?cache=1&img='.formaterurl('$1').str_replace('\\\\\\\\','','$1').'\">';", $contenu);
-$contenu = str_replace('</body>', '<script language="javascript" src="/fb2ie.js"></script></body>', $contenu);
+$contenu = str_replace('</body>', '<center><a href="index1.php">Retour au choix des t\xE9l\xE9sites</a></center><script language="javascript" src="/fb2ie.js"></script></body>', $contenu);
-$ereg = '<source>(.{1,800})<\/source>';
+$ereg = '<source>(.{1,300})<\/source>';
preg_match("/$ereg/s", $contenu, $valeur);
$commandes = $valeur[1];
@@ -64,15 +104,13 @@
$forcerimage = $res2[0]['stopCurrentlyPlaying'];
}
if($res = @$xml->xpath('/url')){
- play_fichier('type=20&temps=8000',$res[0],0,'photo');
+ play_fichier('type=20&temps=15000',$res[0],0,'photo');
}
-
-
-
echo $contenu;
}else{
+$LINK['red']= page_retour_menu();
$smarty->assign('SITES',$sites);
$smarty->assign('CONTENT',$smarty->fetch('telesite.tpl'));
$smarty->display('interface.tpl');
Modified: trunk/module/youtube/index1.php
===================================================================
--- trunk/module/youtube/index1.php 2007-06-04 00:08:34 UTC (rev 179)
+++ trunk/module/youtube/index1.php 2007-07-06 09:15:22 UTC (rev 180)
@@ -26,16 +26,19 @@
function get_recherche($rec,$page){
$contenu = str_replace("\n",'',@file_get_contents_cache('http://www.youtube.com/results?search_query='.urlencode($rec).'&search=Search&page='.$page,2));
- $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>';
+ $ereg = '<img src="(.{1,200})" border="0" class="vimg120" \/><\/a>(.{1,1500})class="newvtitlelink" href="\/watch\?v=(.{1,30})" rel="nofollow" onclick="_hbLink\(\'(.{1,300})\',\'(.{1,150})\'\);">(.{1,200})<\/a><br\/>(.{1,3000})Time:<\/span> <span style="font-size: 12px;" class="runtime">(.{1,8})<\/span>';
+
preg_match_all("/$ereg/s", $contenu, $valeur);
foreach($valeur[1] as $key=>$val){
- $retour[] = array('temps'=>strip_tags($valeur[6][$key]), 'titre'=>utf8_decode(strip_tags($valeur[5][$key])), 'id'=>$valeur[2][$key], 'img'=>$valeur[1][$key]);
+ $retour[] = array('temps'=>strip_tags($valeur[8][$key]), 'titre'=>utf8_decode(strip_tags($valeur[6][$key])), 'id'=>$valeur[3][$key], 'img'=>$valeur[1][$key]);
}
- $ereg = 'Results ([0-9]{1,9})–([0-9]{1,9}) of ([0-9]{1,9})';
+
+ $ereg = '<strong>([0-9]{1,9}) - ([0-9]{1,9})<\/strong> of <strong>([0-9]{1,9})<\/strong>';
if(!preg_match("/$ereg/s", $contenu, $valeur)){
- $ereg = 'Results ([0-9]{1,9})–([0-9]{1,9}) of about ([0-9]{1,9}),([0-9]{1,9}),([0-9]{1,9})';
+ $ereg = '<strong>([0-9]{1,9}) - ([0-9]{1,9})<\/strong> of about <strong>([0-9]{1,9}),([0-9]{1,9}),([0-9]{1,9})<\/strong>';
if(!preg_match("/$ereg/s", $contenu, $valeur)){
- $ereg = 'Results ([0-9]{1,9})–([0-9]{1,9}) of about ([0-9]{1,9}),([0-9]{1,9})';
+ $ereg = '<strong>([0-9]{1,9}) - ([0-9]{1,9})<\/strong> of about <strong>([0-9]{1,9}),([0-9]{1,9})<\/strong>';
+ preg_match("/$ereg/s", $contenu, $valeur);
$valeur[3]=$valeur[3]*1000+$valeur[4];
}else{
$valeur[3]=($valeur[3]*1000+$valeur[4])*1000+$valeur[5];
Modified: trunk/module/youtube/youtube.tpl
===================================================================
--- trunk/module/youtube/youtube.tpl 2007-06-04 00:08:34 UTC (rev 179)
+++ trunk/module/youtube/youtube.tpl 2007-07-06 09:15:22 UTC (rev 180)
@@ -34,5 +34,5 @@
<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.
+La touche {literal}#{/literal} permet de changer entre les minuscules/majuscules et les chiffres. Cette fonction n'est pas disponible pour l'instant pour les non d\xE9group\xE9s.
{/if}
Added: trunk/ressources/icones/Radioblogclub.gif
===================================================================
(Binary files differ)
Property changes on: trunk/ressources/icones/Radioblogclub.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/ressources/icones/Telesites.gif
===================================================================
(Binary files differ)
Property changes on: trunk/ressources/icones/Telesites.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/skin/mediacenter/films.tpl
===================================================================
--- trunk/skin/mediacenter/films.tpl 2007-06-04 00:08:34 UTC (rev 179)
+++ trunk/skin/mediacenter/films.tpl 2007-07-06 09:15:22 UTC (rev 180)
@@ -36,20 +36,33 @@
{/foreach}
</select>
<br>Post-traitement :
-<select name="pp">
-<option value=0 {if $pp_video==1}selected{/if}>0
+{if $vers_fbx==5}
+<select name="pp" bgcolor="{#COULEUR_FOND_RADIO#}">
+<option value=0 {if $pp_video==0}selected{/if}>0
<option value=1 {if $pp_video==1}selected{/if}>1
<option value=2 {if $pp_video==2}selected{/if}>2
<option value=3 {if $pp_video==3}selected{/if}>3
<option value=4 {if $pp_video==4}selected{/if}>4
<option value=5 {if $pp_video==5}selected{/if}>5
<option value=6 {if $pp_video==6}selected{/if}>6
-</select><br>
+</select>
+{else}
+<table width="280" align="left">
+<tr><td width="40">0</td><td><input type=radio bgcolor="{#COULEUR_FOND_RADIO#}" name=pp value=0></td></tr>
+<tr><td width="40">1</td><td><input type=radio bgcolor="{#COULEUR_FOND_RADIO#}" name=pp value=1></td></tr>
+<tr><td width="40">2</td><td><input type=radio bgcolor="{#COULEUR_FOND_RADIO#}" name=pp value=2></td></tr>
+<tr><td width="40">3</td><td><input type=radio bgcolor="{#COULEUR_FOND_RADIO#}" name=pp value=3></td></tr>
+<tr><td width="40">4</td><td><input type=radio bgcolor="{#COULEUR_FOND_RADIO#}" name=pp value=4></td></tr>
+<tr><td width="40">5</td><td><input type=radio bgcolor="{#COULEUR_FOND_RADIO#}" name=pp value=5></td></tr>
+<tr><td width="40">6</td><td><input type=radio bgcolor="{#COULEUR_FOND_RADIO#}" name=pp value=6></td></tr>
+</table>
+{/if}
- Augmenter la qualit\xE9 du traitement de l'image (de 0 vers 6) demande plus de puissance CPU.
- <br>
+<br>
+Augmenter la qualit\xE9 du traitement de l'image (de 0 vers 6) demande plus de puissance CPU.
+<br>
-<table width="500" align="left">
+<table width="360" 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>
<tr><td width="90">Couleur</td><td width="5">:</td><td><input bgcolor="{#COULEUR_FOND_RADIO#}" type=hslider name=denc_saturation min=0 max=255 grad=16></td></tr>
@@ -57,19 +70,26 @@
</table>
{if $vers_fbx==5}
-<select name=display_scaling>
+Format : <select name=display_aspect_ratio bgcolor="{#COULEUR_FOND_RADIO#}">
+<option value=0/0>Auto
+<option value=16/9>16/9
+<option value=4/3>4/3
+</select>
+<br>
+Mode de conversion : <select name=display_scaling bgcolor="{#COULEUR_FOND_RADIO#}">
<option value=letterbox>Letterbox
<option value=panscan>Panscan
<option value=fullscreen>Fullscreen
</select>
-<select name=display_aspect_ratio_conversion>
-<option value=letterbox>Letterbox
-<option value=combined>Combined
-<option value=panscan>Panscan
-<option value=ignore>Ignore
-</select>
{else}
-<table width="250" align="left">
+Aspect ratio :
+<table width="390" align="left">
+<tr><td width="130">Auto</td><td><input type=radio bgcolor="{#COULEUR_FOND_RADIO#}" name=display_aspect_ratio value=0/0></td></tr>
+<tr><td width="130">16/9</td><td><input type=radio bgcolor="{#COULEUR_FOND_RADIO#}" name=display_aspect_ratio value=16/9></td></tr>
+<tr><td width="130">4/3</td><td><input type=radio bgcolor="{#COULEUR_FOND_RADIO#}" name=display_aspect_ratio value=4/3></td></tr>
+</table>
+Mode de conversion :
+<table width="520" align="left">
<tr><td width="130">4/3 Letterbox</td><td><input type=radio bgcolor="{#COULEUR_FOND_RADIO#}" name=display_aspect_ratio_conversion value=letterbox></td></tr>
<tr><td width="130">4/3 Combined</td><td><input type=radio bgcolor="{#COULEUR_FOND_RADIO#}" name=display_aspect_ratio_conversion value=combined></td></tr>
<tr><td width="130">4/3 Pan Scan</td><td><input type=radio bgcolor="{#COULEUR_FOND_RADIO#}" name=display_aspect_ratio_conversion value=panscan></td></tr>
Modified: trunk/skin/simple/interface.tpl
===================================================================
--- trunk/skin/simple/interface.tpl 2007-06-04 00:08:34 UTC (rev 179)
+++ trunk/skin/simple/interface.tpl 2007-07-06 09:15:22 UTC (rev 180)
@@ -54,7 +54,6 @@
</tr>
</table>
</center>
-
</td>
</tr>
<tr>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ara...@us...> - 2007-08-29 20:27:44
|
Revision: 181
http://easybox-mod.svn.sourceforge.net/easybox-mod/?rev=181&view=rev
Author: aragornis
Date: 2007-08-29 13:27:42 -0700 (Wed, 29 Aug 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/_framework/fonctions_partagees.inc.php
trunk/_framework/lib/get_info.php
trunk/_utilisateur/modules.db
trunk/_utilisateur/multiposte.m3u
trunk/configuration/nav.php
trunk/module/films/fichefilm.tpl
Added Paths:
-----------
trunk/configuration2/
trunk/configuration2/addmodule.php
trunk/configuration2/addskin.php
trunk/configuration2/autorisations.php
trunk/configuration2/bases.xml
trunk/configuration2/bibliotheque.php
trunk/configuration2/change_ini.php
trunk/configuration2/config.xml
trunk/configuration2/configuration.php
trunk/configuration2/edituser.php
trunk/configuration2/general.php
trunk/configuration2/get_utilisateur.php
trunk/configuration2/getdir.php
trunk/configuration2/getfiche.php
trunk/configuration2/images/
trunk/configuration2/images/PromoBoxBg.gif
trunk/configuration2/images/PromoBoxBgb.gif
trunk/configuration2/images/PromoBoxBgbblue.gif
trunk/configuration2/images/PromoBoxBgbblueclear.gif
trunk/configuration2/images/PromoBoxLeft.gif
trunk/configuration2/images/PromoBoxLeftb.gif
trunk/configuration2/images/PromoBoxRight.gif
trunk/configuration2/images/PromoBoxRightb.gif
trunk/configuration2/images/RSS.png
trunk/configuration2/images/Reload.gif
trunk/configuration2/images/addmodule.png
trunk/configuration2/images/agenda.png
trunk/configuration2/images/ampoule.png
trunk/configuration2/images/arreter.png
trunk/configuration2/images/audio.png
trunk/configuration2/images/autorisations.png
trunk/configuration2/images/barre_progression_clair.png
trunk/configuration2/images/barre_progression_droit_clair.png
trunk/configuration2/images/barre_progression_droit_fonce.png
trunk/configuration2/images/barre_progression_fonce.png
trunk/configuration2/images/barre_progression_gauche_clair.png
trunk/configuration2/images/barre_progression_gauche_fonce.png
trunk/configuration2/images/barre_progression_milieu.png
trunk/configuration2/images/bibvideo.png
trunk/configuration2/images/comptes.png
trunk/configuration2/images/disque.png
trunk/configuration2/images/disquette.png
trunk/configuration2/images/dossier.png
trunk/configuration2/images/easybox.png
trunk/configuration2/images/general.png
trunk/configuration2/images/haut.png
trunk/configuration2/images/importer.png
trunk/configuration2/images/magnetoscope.png
trunk/configuration2/images/mail.png
trunk/configuration2/images/maj.png
trunk/configuration2/images/module.png
trunk/configuration2/images/multimedia.png
trunk/configuration2/images/podcast.png
trunk/configuration2/images/poubelle.png
trunk/configuration2/images/skin.png
trunk/configuration2/images/telecommande.png
trunk/configuration2/images/utilisateurs.png
trunk/configuration2/images/video.png
trunk/configuration2/images/webradio.png
trunk/configuration2/images/webtv.png
trunk/configuration2/scanaudio.html
trunk/configuration2/scanaudio.php
trunk/configuration2/scanvideo.html
trunk/configuration2/scanvideo.php
trunk/configuration2/script.js
trunk/configuration2/setautorisations.php
trunk/configuration2/setfiche.php
trunk/configuration2/setini.php
trunk/configuration2/template.css
trunk/configuration2/utilisateurs.php
trunk/module/radioblogclub/
trunk/module/radioblogclub/icone.gif
trunk/module/radioblogclub/index1.php
trunk/module/radioblogclub/radioblogclub.tpl
trunk/module/radioblogclub/rb.m3u
trunk/skin/ETI/chaines/L'?\195?\131?\194?\169quipeTV.gif
trunk/skin/ETI/images/buttons/source/PromoBoxBgb.png
Modified: trunk/_framework/fonctions_partagees.inc.php
===================================================================
--- trunk/_framework/fonctions_partagees.inc.php 2007-07-06 09:15:22 UTC (rev 180)
+++ trunk/_framework/fonctions_partagees.inc.php 2007-08-29 20:27:42 UTC (rev 181)
@@ -937,4 +937,8 @@
sqlite_query($db,'DELETE FROM cache WHERE expire<"'.$temps.'"');
sqlite_close($db);
}
+
+function gen_bouton($caption, $fct_js,$class_normal, $class_over){
+ return '<span OnMouseOut="change_class(this,\''.$class_normal.'\');" OnMouseOver="change_class(this,\''.$class_over.'\');" OnClick="'.$fct_js.'" class="'.$class_normal.'">'.$caption.'</span>';
+}
?>
Modified: trunk/_framework/lib/get_info.php
===================================================================
--- trunk/_framework/lib/get_info.php 2007-07-06 09:15:22 UTC (rev 180)
+++ trunk/_framework/lib/get_info.php 2007-08-29 20:27:42 UTC (rev 181)
@@ -112,9 +112,17 @@
//Critique visiteurs
$ereg = 'notepresse=(.{0,10})¬epublic=(.{0,10})';
preg_match("/$ereg/s", $filmrecherche, $valeur);
- $res['critique_visiteurs'] = round(ereg_replace(",", ".", $valeur[2]));
- $res['critique_presse'] = round(ereg_replace(",", ".", $valeur[1]));
-
+ if($valeur[2]!=''){
+ $res['critique_visiteurs'] = round(ereg_replace(",", ".", $valeur[2]));
+ }else{
+ $res['critique_visiteurs'] = 6;
+ }
+ if($valeur[1]!=''){
+ $res['critique_presse'] = round(ereg_replace(",", ".", $valeur[1]));
+ }else{
+ $res['critique_presse'] = 6;
+ }
+
//R\xE9cup\xE9ration de l'adresse de l'image
$ereg = '<img src="http:\/\/a69.g.akamai.net\/n\/69\/10688\/v1\/img5.allocine.fr\/(.{1,70})" border="0" alt="" class="affichette" \/>';
preg_match("/$ereg/s", $filmrecherche, $valeur);
Modified: trunk/_utilisateur/modules.db
===================================================================
(Binary files differ)
Modified: trunk/_utilisateur/multiposte.m3u
===================================================================
--- trunk/_utilisateur/multiposte.m3u 2007-07-06 09:15:22 UTC (rev 180)
+++ trunk/_utilisateur/multiposte.m3u 2007-08-29 20:27:42 UTC (rev 181)
@@ -5,14 +5,10 @@
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=202
#EXTINF:0,5 - France 5
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=203
-#EXTINF:0,6 - M6
-rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=613
#EXTINF:0,7 - Arte
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=204
#EXTINF:0,8 - Direct 8
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=372
-#EXTINF:0,9 - W9
-rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=373
#EXTINF:0,10 - TMC
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=497
#EXTINF:0,12 - NRJ 12 5.1
@@ -123,8 +119,6 @@
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=355
#EXTINF:0,78 - TNA
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=482
-#EXTINF:0,79 - Zalea TV
-rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=483
#EXTINF:0,80 - KTO
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=223
#EXTINF:0,81 - Berbère TV
@@ -187,8 +181,6 @@
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=423
#EXTINF:0,155 - Telif
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=360
-#EXTINF:0,156 - La Locale
-rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=363
#EXTINF:0,157 - Normandie TV
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=383
#EXTINF:0,158 - Télénantes Nantes 7
@@ -297,8 +289,6 @@
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=318
#EXTINF:0,251 - Bulgaria TV
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=321
-#EXTINF:0,252 - Georgian TV
-rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=487
#EXTINF:0,254 - Adjara TV
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=316
#EXTINF:0,255 - Imedi TV
@@ -439,14 +429,10 @@
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=626
#EXTINF:0,605 - France 5 (bas debit)
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=627
-#EXTINF:0,606 - M6 (bas debit)
-rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=628
#EXTINF:0,607 - Arte (bas debit)
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=629
#EXTINF:0,608 - Direct 8 (bas debit)
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=630
-#EXTINF:0,609 - W9 (bas debit)
-rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=631
#EXTINF:0,610 - TMC (bas debit)
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=632
#EXTINF:0,611 - NT1 (bas debit)
@@ -810,3 +796,8 @@
#EXTVLCOPT:no-video
#EXTVLCOPT:audio-track-id=1006
rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=110072
+#EXTINF:0,10073 - Corsica Radio
+#EXTVLCOPT:ts-es-id-pid
+#EXTVLCOPT:no-video
+#EXTVLCOPT:audio-track-id=1007
+rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=110073
Modified: trunk/configuration/nav.php
===================================================================
--- trunk/configuration/nav.php 2007-07-06 09:15:22 UTC (rev 180)
+++ trunk/configuration/nav.php 2007-08-29 20:27:42 UTC (rev 181)
@@ -87,9 +87,10 @@
echo "<br><br>";
//-- Affiche le chemin complet
if (PHP_OS == "WIN32" || PHP_OS == "WINNT") {
-$slash="\\";
+ $slash="\\";
}else{
-$slash="/";}
+ $slash="/";
+}
$chemin_rep = explode( $slash, $chemin);
$n_repertoire =count($chemin_rep);
$n_repertoire2 = "0";
Added: trunk/configuration2/addmodule.php
===================================================================
--- trunk/configuration2/addmodule.php (rev 0)
+++ trunk/configuration2/addmodule.php 2007-08-29 20:27:42 UTC (rev 181)
@@ -0,0 +1,36 @@
+<?php
+$USER = '../_utilisateur/';
+if(isset($_GET['newmodule'])){
+ add_module($_GET['nom'], strtolower(str_replace(' ','',supprime_accents($_GET['nom']))).'/', 'index1.php', '1', '1', '1', '1', '1', $_GET['version'], $_GET['description'], 'Module', 'Alone', $_GET['categorie']);
+ get_module_list();
+
+?>
+<div class="titrerec titrereclarger"><div class="coin gh"> </div><div class="titre titrelarger" id="titre">Le nouveau module a bien \xE9t\xE9 ajout\xE9.</div><div class="coin dh"> </div></div><div class="res2">
+<div class="item">Le module <?=$_GET['nom'];?> a bien \xE9t\xE9 ajout\xE9. Son dossier est /module/<?=strtolower(str_replace(' ','',supprime_accents($_GET['nom']))).'/';?> et la page lanc\xE9e au lancenent est /module/<?=strtolower(str_replace(' ','',supprime_accents($_GET['nom']))).'/';?>index1.php. Pour lui associer une icone, cr\xE9ez le fichier /ressources/icones/<?=str_replace(array('>',' !',' ','\xE9','\xEE','\xF4'),array('','','','e','i','o'),$_GET['nom'])?>.gif en respectant les limitations sur les fichiers images propres \xE0 la freebox.</div>
+</div><div class="titrerecb titrerecblarger"><div class="coin gb"> </div><div class="titre titrelarger"> </div><div class="coin db"> </div></div>
+<?php
+}
+
+?>
+<div class="titrerec titrereclarger"><div class="coin gh"> </div><div class="titre titrelarger" id="titre">Ajout d'un nouveau module</div><div class="coin dh"> </div></div><div class="res2">
+<div class="item">
+Vous pouvez ajouter manuellement un module. Le module sera entr\xE9 dans la base de donn\xE9es d'Easybox. Le dossier qui correspondra \xE0 ce module sera /module/{nom du module}/. La page qui sera charg\xE9e au lancement du module sera index1.php.
+</div>
+<div class="item">
+
+ <form action="configuration.php" method="get">
+ <input type=hidden name=page value=addmodule>
+ <input type=hidden name=newmodule value=1>
+ Nom : <input name="nom" id="nom" type="text" value=""><br><br>
+ Version du module : <input name="version" id="version" type="text" value=""> (ex : 3.4.0)<br><br>
+ Cat\xE9gorie du module : <select name="categorie" id="categorie" size="1">
+ <option value="9">Multim\xE9dia</option>
+ <option value="18">Web</option>
+ <option value="29">Pratique</option>
+ </select><br><br>
+ Description : <textarea name="commentaire" id="commentaire" style="width:400px;height:100px;"></textarea><br>
+ <input type=submit value="Ajouter le module">
+ </form>
+</div>
+
+<div class="titrerecb titrerecblarger"><div class="coin gb"> </div><div class="titre titrelarger"> </div><div class="coin db"> </div></div>
Added: trunk/configuration2/addskin.php
===================================================================
--- trunk/configuration2/addskin.php (rev 0)
+++ trunk/configuration2/addskin.php 2007-08-29 20:27:42 UTC (rev 181)
@@ -0,0 +1,31 @@
+<?php
+$USER = '../_utilisateur/';
+if(isset($_GET['newskin'])){
+ add_module($_GET['nom'], strtolower(str_replace(' ','',supprime_accents($_GET['nom']))).'/', '', '', '', '', '', '', $_GET['version'], $_GET['description'], 'Skin', 'Alone', '');
+ get_module_list();
+
+?>
+<div class="titrerec titrereclarger"><div class="coin gh"> </div><div class="titre titrelarger" id="titre">Le nouveau module a bien \xE9t\xE9 ajout\xE9.</div><div class="coin dh"> </div></div><div class="res2">
+<div class="item">Le skin <?=$_GET['nom'];?> a bien \xE9t\xE9 ajout\xE9. Son dossier est /skin/<?=strtolower(str_replace(' ','',supprime_accents($_GET['nom']))).'/';?>. Vous devez placer un aper\xE7u de ce skin sous le nom de fichier /skin/<?=strtolower(str_replace(' ','',supprime_accents($_GET['nom']))).'/';?>/vuedensemble.gif.</div>
+</div><div class="titrerecb titrerecblarger"><div class="coin gb"> </div><div class="titre titrelarger"> </div><div class="coin db"> </div></div>
+<?php
+}
+
+?>
+<div class="titrerec titrereclarger"><div class="coin gh"> </div><div class="titre titrelarger" id="titre">Ajout d'un nouveau skin</div><div class="coin dh"> </div></div><div class="res2">
+<div class="item">
+Vous pouvez ajouter manuellement un skin. Le skin sera entr\xE9 dans la base de donn\xE9es d'Easybox. Le dossier qui correspondra \xE0 ce module sera /skin/{nom du module}/. Le skin devra respecter la structure de base des skins Easybox, comme indiqu\xE9 dans la documentation d'Easybox.
+</div>
+<div class="item">
+
+ <form action="configuration.php" method="get">
+ <input type=hidden name=page value=addskin>
+ <input type=hidden name=newskin value=1>
+ Nom : <input name="nom" id="nom" type="text" value=""><br><br>
+ Version : <input name="version" id="version" type="text" value=""> (ex : 1.0.0)<br><br>
+ Description : <textarea name="commentaire" id="commentaire" style="width:400px;height:100px;"></textarea><br>
+ <input type=submit value="Ajouter le skin">
+ </form>
+</div>
+
+<div class="titrerecb titrerecblarger"><div class="coin gb"> </div><div class="titre titrelarger"> </div><div class="coin db"> </div></div>
Added: trunk/configuration2/autorisations.php
===================================================================
--- trunk/configuration2/autorisations.php (rev 0)
+++ trunk/configuration2/autorisations.php 2007-08-29 20:27:42 UTC (rev 181)
@@ -0,0 +1,47 @@
+<?php
+
+$RACINE_REP = '../';
+$USER = '../_utilisateur/';
+$ini_class = new INI($USER.'configuration.ini');
+$RES_ICO = '../ressources/icones/';
+$SKIN_REP = $RACINE_REP.'skin/'.skin_rep();
+$ICONE_REP = $SKIN_REP.'icones/';
+
+$MOD = get_all_module();
+$db = sqlite_open($USER.'modules.db', 0666);
+
+echo '<div class="titrerec titrereclarger"><div class="coin gh"> </div><div class="titre titrelarger" id="titre">Choix de l\'utilisateur</div><div class="coin dh"> </div></div><div class="res2">';
+
+for($i=5;$i>0;$i--){
+ if($ini['utilisateur']['namelevel'.$i]!=''){
+ echo '<a class="enregistrer" id="utilis'.$i.'" href="javascript:edite_utilisation(\''.$i.'\');">'.$ini['utilisateur']['namelevel'.$i].'</a>';
+ }
+}
+
+echo '</div><div class="titrerecb titrerecblarger"><div class="coin gb"> </div><div class="titre titrelarger"> </div><div class="coin db"> </div></div>';
+
+for($i=5;$i>0;$i--){
+ if($ini['utilisateur']['namelevel'.$i]!=''){
+ echo '<div id="pannel'.$i.'" style="display:none;"><div class="titrerec titrereclarger"><div class="coin gh"> </div><div class="titre titrelarger" id="titre">Edition de '.$ini['utilisateur']['namelevel'.$i].'</div><div class="coin dh"> </div></div><div class="res2" style="height:'.((97*ceil(count($MOD)/9))+39).'px;border-right:1px solid #A0A0A0;border-left:1px solid #A0A0A0;border-bottom:1px solid #A0A0A0;width:848px;">';
+ echo '<div class="item" style="border-right:none;border-left:none;">Les modules sur fond rouge sont d\xE9sactiv\xE9s pour l\'utilisateur s\xE9lectionn\xE9. Les verts sont eux activ\xE9s. S\xE9lectionnez un utilisateur puis cliquez sur chaque module afin de l\'activer ou le d\xE9sactiver. Les permissions sont enregistr\xE9es automatiquement.</div>';
+ foreach($MOD as $m){
+ if($m['actif'.$i]==1){
+ $couleur = 'green';
+ }else{
+ $couleur = 'red';
+ }
+ echo '<div OnMouseOver="temp=this.style.backgroundColor;this.style.backgroundColor=\'#CBDAE4;\';this.style.border=\'1px solid #A0A0A0;\';this.style.padding=\'2px\';" OnMouseOut="this.style.backgroundColor=temp;this.style.border=\'none\';this.style.padding=\'3px\';" onClick="change_autorisation(\''.$i.'\',\''.$m['id'].'\');" style="float:left;width:82px;height:85px;margin:3px;padding:3px;cursor:pointer;background-color:'.$couleur.';"><img src="/';
+ if($m['dependance']=='Alone'){
+ echo $RES_ICO;
+ }else{
+ echo $ICONE_REP;
+ }
+ echo str_replace(array('>',' !',' ','\xE9','\xEE','\xF4','\xE0'),array('','','','e','i','o','a'),$m['nom']).'.gif" style="background-color:white;border:1px solid #A0A0A0;"><br>';
+ echo $m['nom'].'</div>';
+ }
+ echo '</div><div class="titrerecb titrerecblarger"><div class="coin gb"> </div><div class="titre titrelarger"> </div><div class="coin db"> </div></div></div>';
+ }
+}
+
+
+?>
Added: trunk/configuration2/bases.xml
===================================================================
--- trunk/configuration2/bases.xml (rev 0)
+++ trunk/configuration2/bases.xml 2007-08-29 20:27:42 UTC (rev 181)
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<rss xmlns:dc="http://purl.org/dc/elements/1.1/" version="2.0">
+
+<base>
+ <nom>video.db</nom>
+ <table>
+ <name>film</name>
+ <syntax>CREATE TABLE film ( id INTEGER NOT NULL PRIMARY KEY DEFAULT "0" , name TEXT , dir TEXT , Synopsis TEXT , img TEXT , sortie INT , realisateur TEXT , avec TEXT , film TEXT , genre TEXT , Duree TEXT , production TEXT , critique_visiteurs TEXT , critique_presse TEXT , ba TEXT , auto INTEGER , last_update INTEGER)</syntax>
+ </table>
+ <table>
+ <name>celebrite</name>
+ <syntax>CREATE TABLE celebrite ( id INTEGER NOT NULL PRIMARY KEY DEFAULT "0" , nom TEXT , date_naissance INT , lieu_naissance TEXT , img TEXT , bio INT , statut TEXT , last_update INTEGER)</syntax>
+ </table>
+</base>
+
+<base>
+ <nom>audio.db</nom>
+ <table>
+ <name>music</name>
+ <syntax>CREATE TABLE music ( id INTEGER NOT NULL PRIMARY KEY, filename TEXT NOT NULL, artist TEXT, name TEXT, album TEXT, genre TEXT, year TEXT)</syntax>
+ </table>
+</base>
+
+<base>
+ <nom>podcast.db</nom>
+ <table>
+ <name>feeds</name>
+ <syntax>CREATE TABLE feeds ( id INT NOT NULL , name VARCHAR( 250 ) NOT NULL , add VARCHAR( 500 ) NOT NULL , PRIMARY KEY ( id ) )</syntax>
+ </table>
+ <table>
+ <name>radios</name>
+ <syntax>CREATE TABLE radios (id INTEGER NOT NULL PRIMARY KEY DEFAULT "0", name VARCHAR( 250 ) NOT NULL , add VARCHAR( 500 ) NOT NULL )</syntax>
+ </table>
+ <table>
+ <name>tvs</name>
+ <syntax>CREATE TABLE tvs (id INTEGER NOT NULL PRIMARY KEY DEFAULT "0", name VARCHAR( 250 ) NOT NULL , add VARCHAR( 500 ) NOT NULL )</syntax>
+ </table></base>
+
+<base>
+ <nom>records.db</nom>
+ <table>
+ <name>records</name>
+ <syntax>CREATE TABLE records ( id INT NOT NULL , chaine VARCHAR( 1000 ) NOT NULL , debut TIMESTAMP NOT NULL , fin TIMESTAMP NOT NULL , fichierbat VARCHAR( 1000 ) NOT NULL , task INT NOT null , taskend INT NOT null , statut VARCHAR( 100 ) , UNIQUE ( id ) )</syntax>
+ </table>
+</base>
+
+<base>
+ <nom>rss.db</nom>
+ <table>
+ <name>cat</name>
+ <syntax>CREATE TABLE cat ( id INT NOT NULL , name VARCHAR( 250 ) NOT NULL , PRIMARY KEY ( id ) )</syntax>
+ </table>
+ <table>
+ <name>feeds</name>
+ <syntax>CREATE TABLE feeds ( id INT NOT NULL , cat VARCHAR( 250 ) NOT NULL , name VARCHAR( 250 ) NOT NULL , add VARCHAR( 500 ) NOT NULL , img VARCHAR( 500 ) NULL , description VARCHAR( 500 ) NULL ,PRIMARY KEY ( id ) )</syntax>
+ </table>
+</base>
+
+<base>
+ <nom>utilisateur.db</nom>
+ <table>
+ <name>favoris</name>
+ <syntax>CREATE TABLE favoris ( id INTEGER NOT NULL PRIMARY KEY , lien VARCHAR( 60000 ) NOT NULL )</syntax>
+ </table>
+ <table>
+ <name>signet</name>
+ <syntax>CREATE TABLE signet ( id INTEGER NOT NULL PRIMARY KEY , lien VARCHAR( 60000 ) NOT NULL,duree VARCHAR( 60000 ) NOT NULL )</syntax>
+ </table>
+ <table>
+ <name>var</name>
+ <syntax>CREATE TABLE var (var VARCHAR, value LONGTEXT)</syntax>
+ </table>
+ <table>
+ <name>templates</name>
+ <syntax>CREATE TABLE templates (template VARCHAR, url TEXT)</syntax>
+ </table>
+ <table>
+ <name>cinemas</name>
+ <syntax>CREATE TABLE cinemas ( timestamp INT, cinema LONGTEXT, page VARCHAR )</syntax>
+ </table>
+</base>
+
+<base>
+ <nom>agenda.db</nom>
+ <table>
+ <name>calendrier</name>
+ <syntax>CREATE TABLE calendrier ( idx INTEGER PRIMARY KEY, jour NOT NULL, heure NOT NULL, minute NOT NULL, duree, lieu, description )</syntax>
+ </table>
+</base>
+
+<base>
+ <nom>cache.db</nom>
+ <table>
+ <name>film</name>
+ <syntax>CREATE TABLE film ( id INTEGER NOT NULL PRIMARY KEY DEFAULT "0" , file TEXT, name TEXT , Synopsis TEXT , img TEXT , sortie INT , realisateur TEXT , avec TEXT , film TEXT , genre TEXT , Duree TEXT , production TEXT , critique_visiteurs TEXT , critique_presse TEXT , ba TEXT )</syntax>
+ </table>
+ <table>
+ <name>cache</name>
+ <syntax>CREATE TABLE cache ( id INTEGER NOT NULL PRIMARY KEY DEFAULT "0" , fichier TEXT, expire TEXT )</syntax>
+ </table>
+</base>
+
+<base>
+ <nom>modules.db</nom>
+ <table>
+ <name>modules</name>
+ <syntax>CREATE TABLE modules ( id INTEGER PRIMARY KEY , nom TEXT , repertoire TEXT , lien TEXT , actif1 TEXT , actif2 TEXT , actif3 TEXT , actif4 TEXT , actif5 TEXT , version TEXT , description TEXT , type TEXT , dependance TEXT , categorie INTEGER)</syntax>
+ </table>
+</base>
+</rss>
+
Added: trunk/configuration2/bibliotheque.php
===================================================================
--- trunk/configuration2/bibliotheque.php (rev 0)
+++ trunk/configuration2/bibliotheque.php 2007-08-29 20:27:42 UTC (rev 181)
@@ -0,0 +1,25 @@
+<div class="titrerec titrereclarger"><div class="coin gh"> </div><div class="titre titrelarger3" id="titre">Biblioth\xE8que vid\xE9o</div><?=gen_bouton('+', 'ajouterfiche();', 'bouton boutonlast', 'boutonselected boutonlast');?><div class="coin dh"> </div></div><div class="res2">
+<div class="item">Voici le contenu de votre biblioth\xE8que vid\xE9o. Cliquez sur un nom pour \xE9diter la fiche du film facilement.</div>
+
+<?php
+
+$db = sqlite_open('../_utilisateur/video.db', 0666);
+
+function cutLongWords($string,$length,$separation) {
+ return preg_replace('/([^ ]{'.$length.'})/si','\1'.$separation,$string);
+}
+
+$result = sqlite_array_query($db, 'SELECT * from film ORDER BY name asc', SQLITE_ASSOC);
+foreach ($result as $entry) {
+ echo '<a class="enregistrer" href="javascript:editfiche(\''.$entry['id'].'\');"><img id="imageminiature'.$entry['id'].'" src="'.$entry['img'].'" class="icone" style="float:left;width:15px;height:20px;">'.$entry['name'].'</a>';
+}
+
+?>
+
+</div><div class="titrerecb titrerecblarger"><div class="coin gb"> </div><div class="titre titrelarger"> </div><div class="coin db"> </div></div>
+
+<div id="fiche" style="position:absolute;top:0px;left:0px;visibility:hidden;width:860px;height:550px;"></div>
+
+<script language="javascript">
+fix_position_dir('fiche');
+</script>
Added: trunk/configuration2/change_ini.php
===================================================================
Added: trunk/configuration2/config.xml
===================================================================
--- trunk/configuration2/config.xml (rev 0)
+++ trunk/configuration2/config.xml 2007-08-29 20:27:42 UTC (rev 181)
@@ -0,0 +1,498 @@
+<?xml version = '1.0' encoding = 'iso-8859-1'?>
+<rss version="2.0" >
+ <channel>
+ <categorie name="explorateur" >
+ <souscat name="films_defaut" >
+ <name>Dossiers o&ugrave; le scanner doit chercher vos vid&eacute;os. Le premier de la liste sera le dossier par d&eacute;faut de l'explorateur de films.</name>
+ <type>navigateur</type>
+ <defaut1>c:\</defaut1>
+ <defaut2>/</defaut2>
+ </souscat>
+ <souscat name="photos_defaut" >
+ <name>Dossier des photos par d&eacute;faut. Le premier de la liste sera le dossier par d&eacute;faut de l'explorateur de photos.</name>
+ <type>navigateur</type>
+ <defaut1>c:\</defaut1>
+ <defaut2>/</defaut2>
+ </souscat>
+ <souscat name="audio_defaut" >
+ <name>Dossiers o&ugrave; le scanner doit chercher vos fichiers audios. Le premier de la liste sera le dossier par d&eacute;faut de l'explorateur audio.</name>
+ <type>navigateur</type>
+ <defaut1>c:\</defaut1>
+ <defaut2>/</defaut2>
+ </souscat>
+ <souscat name="dvd" >
+ <name>Lettre de votre lecteur DVD</name>
+ <type>dvd</type>
+ <defaut1>d:</defaut1>
+ <defaut2>/mnt/cdrom</defaut2>
+ </souscat>
+ <souscat name="ext" >
+ <name>Extensions interpr&eacute;t&eacute;es comme des fichiers vid&eacute;os par Easy-Box</name>
+ <type>text</type>
+ <defaut>.avi,.mpg,.mpeg,.mkv,.ogg,.wmv,.wma,.mp4,.3gp,.mov</defaut>
+ </souscat>
+ <souscat name="ext_photo" >
+ <name>Extensions interpr&eacute;t&eacute;es comme des photos par Easy-Box</name>
+ <type>text</type>
+ <defaut>.jpg,.gif,.bmp,.jpeg,.png</defaut>
+ </souscat>
+ <souscat name="ext_audio" >
+ <name>Extensions interpr&eacute;t&eacute;es comme des fichiers audios par Easy-Box</name>
+ <type>text</type>
+ <defaut>.mp3,.ogg,.wma,.cda,.m3u,.wav</defaut>
+ </souscat>
+ <souscat name="ext_noscan" >
+ <name>Ne pas traiter les r&eacute;pertoires dont le nom contient une des valeurs suivantes lors des scans : tout dossier contenant une de ces chaines sera volontairement oubli\xE9.</name>
+ <type>text</type>
+ <defaut>NOSCAN</defaut>
+ </souscat>
+ <souscat name="afficher_fichier_cache" >
+ <name>Afficher les fichiers cach&eacute;s dans les explorateurs</name>
+ <type>boolean</type>
+ <defaut>non</defaut>
+ </souscat>
+ <souscat name="nettoyer" >
+ <name>Chaines de caract&egrave;res supprim&eacute;es dans le nom des films pour une recherche plus ais&eacute;e d'information sur internet. Ex : "James.Bond.cd1.avi" deviendra "James.Bond..avi".</name>
+ <type>text</type>
+ <defaut>cd1,cd2,divx,dvdrip,_,FRENCH,VOSTFR,Vostfr</defaut>
+ </souscat>
+ <souscat name="liste_amc_defaut" >
+ <name>Dossier contenant le fichier a scanner pour importer les donn&eacute;es du logiciel Ant Movie Catalogue.</name>
+ <type>text</type>
+ <defaut1>C:\Program Files\Ant Movie Catalog\Catalogs</defaut1>
+ <defaut2>/</defaut2>
+ </souscat>
+ <souscat name="nom_amc_defaut" >
+ <name>Nom du fichier Ant Movie Catalogue au format XML qui doit &eacute;tre scann&eacute;.</name>
+ <type>text</type>
+ <defaut1>exemple.xml</defaut1>
+ <defaut2>/</defaut2>
+ </souscat>
+ <souscat name="image_amc_defaut" >
+ <name>Dossier contenant les images g&eacute;n&eacute;r&eacute;es lors de la sauvegarde du fichier XML par Ant Movie Catalogue.</name>
+ <type>text</type>
+ <defaut1>C:\Program Files\Ant Movie Catalog\Catalogs</defaut1>
+ <defaut2>/</defaut2>
+ </souscat>
+ <souscat name="afficher_personnes" >
+ <name>Afficher les fiches des personnalit&eacute;s.</name>
+ <type>boolean</type>
+ <defaut>oui</defaut>
+ </souscat>
+ </categorie>
+ <categorie name="multimedia" >
+ <souscat name="sortiefreebox" >
+ <name>Quelle sortie audio voulez-vous utiliser ?</name>
+ <type>options</type>
+ <option>
+ <choix>
+ <nom>Sortie TV transcod&eacute;e (St&eacute;r&eacute;o)</nom>
+ <titre>TV</titre>
+ </choix>
+ <choix>
+ <nom>Sortie TV non-transcod&eacute;e (AC3)</nom>
+ <titre>AC3</titre>
+ </choix>
+ <choix>
+ <nom>Carte son PC</nom>
+ <titre>PC</titre>
+ </choix>
+ </option>
+ <defaut>TV</defaut>
+ </souscat>
+ <souscat name="compensation" >
+ <name>Permet de d&eacute;caler la bande son pour qu'elle commence apr&egrave;s la vid&eacute;o (&agrave; utiliser quand le son sort de la carte son du PC et que le son est d&eacute;cal&eacute; sinon mettre &agrave; 0) (en millisecondes)</name>
+ <type>text</type>
+ <typeplus>numeric</typeplus>
+ <defaut>0</defaut>
+ </souscat>
+ <souscat name="qualite" >
+ <name>Selectionnez ici le profil de qualit&eacute; de VLC. Le profil "Wifi et ordinateurs moyens" permet d'&eacute;conomiser l&eacute;g&agrave;rement le processeur et les d&eacute;bits au d&eacute;triment de la qualit&eacute;. Le profil "Wifi difficile et ordinateurs peu puissants" appuie encore ce ph&eacute;nom&agrave;ne.</name>
+ <type>options</type>
+ <option>
+ <choix>
+ <nom>Normal</nom>
+ <titre>play.html</titre>
+ </choix>
+ <choix>
+ <nom>Wifi et ordinateurs moyens</nom>
+ <titre>play-wifi.html</titre>
+ </choix>
+ <choix>
+ <nom>Wifi difficile et ordinateurs peu puissants</nom>
+ <titre>play-low.html</titre>
+ </choix>
+ </option>
+ <defaut>play.html</defaut>
+ </souscat>
+ </categorie>
+ <categorie name="mail" >
+ <souscat name="serveur" >
+ <name>Adresse de votre serveur mail (pop3,...)</name>
+ <type>text</type>
+ <defaut/>
+ </souscat>
+ <souscat name="service_port" >
+ <name>Port sur lequel Easy-Box se connecte &agrave; votre serveur mail</name>
+ <type>text</type>
+ <typeplus>numeric</typeplus>
+ <defaut>110</defaut>
+ </souscat>
+ <souscat name="login" >
+ <name>Nom d'utilisateur de votre compte mail</name>
+ <type>text</type>
+ <defaut/>
+ </souscat>
+ <souscat name="pass" >
+ <name>Mot de passe pour vous connecter &agrave; votre compte mail</name>
+ <type>password</type>
+ <defaut/>
+ </souscat>
+ </categorie>
+ <categorie name="messagerie" >
+ <souscat name="compte" >
+ <name>Num&eacute;ro de votre compte Free Haut-D&eacute;bit (inutilis&eacute; pour l'instant)</name>
+ <type>text</type>
+ <typeplus>numeric</typeplus>
+ <defaut/>
+ </souscat>
+ <souscat name="motdepasse" >
+ <name>Mot de passe de votre compte Free Haut-D&eacute;bit (inutilis&eacute; pour l'instant)</name>
+ <type>password</type>
+ <defaut/>
+ </souscat>
+ </categorie>
+ <categorie name="skin" >
+ <souscat name="skin" >
+ <name>Skin par defaut</name>
+ <type>hidden</type>
+ <defaut>Simple</defaut>
+ </souscat>
+ </categorie>
+ <categorie name="download" >
+ <souscat name="patch" >
+ <name>Chemin o&ugrave; sont stock&eacute;es les mises &agrave; jour</name>
+ <type>text</type>
+ <defaut>http://www.easybox-mod.org/modules/addon/</defaut>
+ </souscat>
+ <souscat name="xml" >
+ <name>Chemin vers le fichier listant les mises &agrave; jour</name>
+ <type>text</type>
+ <defaut>http://www.easybox-mod.org/genxml.php</defaut>
+ </souscat>
+ <souscat name="maj" >
+ <name>Voulez-vous qu'Easybox se mette &agrave; jour automatiquement ? (Il est fortement d&eacute;conseill&eacute; de d&eacute;sactiver cette option)</name>
+ <type>boolean</type>
+ <defaut>oui</defaut>
+ </souscat>
+ </categorie>
+ <categorie name="demarrage" >
+ <souscat name="demarrage" >
+ <name>Modifier la page de d&eacute;marrage</name>
+ <type>hidden</type>
+ <defaut>_menu/menu.php</defaut>
+ </souscat>
+ </categorie>
+ <categorie name="utilisateur" >
+ <souscat name="actif" >
+ <name>Activer la gestion des login de connexion &agrave; Easy-Box</name>
+ <type>boolean</type>
+ <defaut>non</defaut>
+ </souscat>
+ <souscat name="namelevel5" >
+ <name>Nom de l'acces niveau 5 (le plus haut grade, permet d'acc&egrave;der &agrave; tous les modules et &agrave; la configuration &agrave; tout)</name>
+ <type>text</type>
+ <defaut>Admin</defaut>
+ </souscat>
+ <souscat name="level5" >
+ <name>Mot de passe de l'acces niveau 5 (chiffres uniquement)</name>
+ <type>password</type>
+ <typeplus>numeric</typeplus>
+ <defaut/>
+ </souscat>
+ <souscat name="namelevel4" >
+ <name>Nom de l'acces niveau 4 - En laissant le nom vide, ce niveau d'acces sera supprim&eacute;</name>
+ <type>text</type>
+ <defaut/>
+ </souscat>
+ <souscat name="level4" >
+ <name>Mot de passe de l'acces niveau 4 (chiffres uniquement)</name>
+ <type>password</type>
+ <typeplus>numeric</typeplus>
+ <defaut/>
+ </souscat>
+ <souscat name="namelevel3" >
+ <name>Nom de l'acces niveau 3 - En laissant le nom vide, ce niveau d'acces sera supprim&eacute;</name>
+ <type>text</type>
+ <defaut/>
+ </souscat>
+ <souscat name="level3" >
+ <name>Mot de passe de l'acces niveau 3 (chiffres uniquement)</name>
+ <type>password</type>
+ <typeplus>numeric</typeplus>
+ <defaut/>
+ </souscat>
+ <souscat name="namelevel2" >
+ <name>Nom de l'acces niveau 2 - En laissant le nom vide, ce niveau d'acces sera supprim&eacute;</name>
+ <type>text</type>
+ <defaut/>
+ </souscat>
+ <souscat name="level2" >
+ <name>Mot de passe de l'acces niveau 2 (chiffres uniquement)</name>
+ <type>password</type>
+ <typeplus>numeric</typeplus>
+ <defaut/>
+ </souscat>
+ <souscat name="namelevel1" >
+ <name>Nom de l'acces niveau 1 (le plus petit grade, acc&egrave;s le plus control&eacute;) - En laissant le nom vide, ce niveau d'acc&egrave;s sera supprim&eacute;</name>
+ <type>text</type>
+ <defaut/>
+ </souscat>
+ <souscat name="level1" >
+ <name>Mot de passe de l'acces niveau 1 (chiffres uniquement)</name>
+ <type>password</type>
+ <typeplus>numeric</typeplus>
+ <defaut/>
+ </souscat>
+ </categorie>
+ <categorie name="favoris" >
+ <souscat name="touche1" >
+ <name>Touche 1</name>
+ <type>telecomande</type>
+ <defaut>films/</defaut>
+ </souscat>
+ <souscat name="touche2" >
+ <name>Touche 2</name>
+ <type>telecomande</type>
+ <defaut>mp3/</defaut>
+ </souscat>
+ <souscat name="touche3" >
+ <name>Touche 3</name>
+ <type>telecomande</type>
+ <defaut>diaporama/</defaut>
+ </souscat>
+ <souscat name="touche4" >
+ <name>Touche 4</name>
+ <type>telecomande</type>
+ <defaut>guidetv/</defaut>
+ </souscat>
+ <souscat name="touche5" >
+ <name>Touche 5</name>
+ <type>telecomande</type>
+ <defaut>meteo/</defaut>
+ </souscat>
+ <souscat name="touche6" >
+ <name>Touche 6</name>
+ <type>telecomande</type>
+ <defaut>mail/</defaut>
+ </souscat>
+ <souscat name="touche7" >
+ <name>Touche 7</name>
+ <type>telecomande</type>
+ <defaut>jt/</defaut>
+ </souscat>
+ <souscat name="touche8" >
+ <name>Touche 8</name>
+ <type>telecomande</type>
+ <defaut>livescore/</defaut>
+ </souscat>
+ <souscat name="touche9" >
+ <name>Touche 9</name>
+ <type>telecomande</type>
+ <defaut>maj_mod/</defaut>
+ </souscat>
+ </categorie>
+ <categorie name="multiposte" >
+ <souscat name="muxer" >
+ <name>Muxer &agrave; utiliser pour l'enregistrement</name>
+ <type>options</type>
+ <option>
+ <choix>
+ <nom>ts</nom>
+ <titre>ts</titre>
+ </choix>
+ <choix>
+ <nom>ps</nom>
+ <titre>ps</titre>
+ </choix>
+ <choix>
+ <nom>mpeg1</nom>
+ <titre>mpeg1</titre>
+ </choix>
+ <choix>
+ <nom>ogg</nom>
+ <titre>ogg</titre>
+ </choix>
+ <choix>
+ <nom>asf</nom>
+ <titre>asf</titre>
+ </choix>
+ <choix>
+ <nom>mp4</nom>
+ <titre>mp4</titre>
+ </choix>
+ <choix>
+ <nom>mov</nom>
+ <titre>mov</titre>
+ </choix>
+ <choix>
+ <nom>wav</nom>
+ <titre>wav</titre>
+ </choix>
+ <choix>
+ <nom>raw</nom>
+ <titre>raw</titre>
+ </choix>
+ </option>
+ <defaut>ps</defaut>
+ </souscat>
+ <souscat name="cvid" >
+ <name>Codec vid&eacute;o</name>
+ <type>options</type>
+ <option>
+ <choix>
+ <nom>Aucun</nom>
+ <titre>none</titre>
+ </choix>
+ <choix>
+ <nom>mp1v</nom>
+ <titre>mp1v</titre>
+ </choix>
+ <choix>
+ <nom>mp2v</nom>
+ <titre>mp2v</titre>
+ </choix>
+ <choix>
+ <nom>mp4v</nom>
+ <titre>mp4v</titre>
+ </choix>
+ <choix>
+ <nom>DIV1</nom>
+ <titre>DIV1</titre>
+ </choix>
+ <choix>
+ <nom>DIV2</nom>
+ <titre>DIV2</titre>
+ </choix>
+ <choix>
+ <nom>DIV3</nom>
+ <titre>DIV3</titre>
+ </choix>
+ <choix>
+ <nom>H263</nom>
+ <titre>H263</titre>
+ </choix>
+ <choix>
+ <nom>MV1</nom>
+ <titre>MV1</titre>
+ </choix>
+ <choix>
+ <nom>MV2</nom>
+ <titre>MV2</titre>
+ </choix>
+ <choix>
+ <nom>MJPG</nom>
+ <titre>MJPG</titre>
+ </choix>
+ <choix>
+ <nom>theo</nom>
+ <titre>theo</titre>
+ </choix>
+ </option>
+ <defaut>none</defaut>
+ </souscat>
+ <souscat name="caud" >
+ <name>Codec audio</name>
+ <type>options</type>
+ <option>
+ <choix>
+ <nom>Aucun</nom>
+ <titre>none</titre>
+ </choix>
+ <choix>
+ <nom>mpga</nom>
+ <titre>mpga</titre>
+ </choix>
+ <choix>
+ <nom>mp2a</nom>
+ <titre>mp2a</titre>
+ </choix>
+ <choix>
+ <nom>mp3</nom>
+ <titre>mp3</titre>
+ </choix>
+ <choix>
+ <nom>mp4a</nom>
+ <titre>mp4a</titre>
+ </choix>
+ <choix>
+ <nom>a52</nom>
+ <titre>a52</titre>
+ </choix>
+ <choix>
+ <nom>vorb</nom>
+ <titre>vorb</titre>
+ </choix>
+ <choix>
+ <nom>flac</nom>
+ <titre>flac</titre>
+ </choix>
+ <choix>
+ <nom>spx</nom>
+ <titre>spx</titre>
+ </choix>
+ <choix>
+ <nom>s16l</nom>
+ <titre>s16l</titre>
+ </choix>
+ <choix>
+ <nom>fl32</nom>
+ <titre>fl32</titre>
+ </choix>
+ </option>
+ <defaut>none</defaut>
+ </souscat>
+ <souscat name="bvid" >
+ <name>Bitrate vid&eacute;o</name>
+ <type>text</type>
+ <typeplus>numeric</typeplus>
+ <defaut>2000</defaut>
+ </souscat>
+ <souscat name="baud" >
+ <name>Bitrate audio</name>
+ <type>text</type>
+ <typeplus>numeric</typeplus>
+ <defaut>256</defaut>
+ </souscat>
+ <souscat name="multiposte" >
+ <name>Disque &agrave; la base duquel sont mis les enregistrements vid&eacute;o</name>
+ <type>dvd</type>
+ <defaut>c:</defaut>
+ </souscat>
+ </categorie>
+ <categorie name="screensaver" >
+ <souscat name="scr_actif" >
+ <name>Activer le screensaver</name>
+ <type>boolean</type>
+ <defaut>non</defaut>
+ </souscat>
+ <souscat name="scr_duree" >
+ <name>Temps avant lancement automatique du screensaver (touche 0 = lancement manuel)</name>
+ <type>text</type>
+ <defaut>60</defaut>
+ </souscat>
+ <souscat name="scr_temps" >
+ <name>D&eacute;lais entre le changement d'image (0 = al&eacute;atoire)</name>
+ <type>text</type>
+ <defaut>0</defaut>
+ </souscat>
+ </categorie>
+ <categorie name="modules" >
+ <souscat name="afficher_categories" >
+ <name>Afficher les cat&eacute;gories dans le menu principal.</name>
+ <type>boolean</type>
+ <defaut>oui</defaut>
+ </souscat>
+ </categorie>
+ </channel>
+</rss>
Added: trunk/configuration2/configuration.php
===================================================================
--- trunk/configuration2/configuration.php (rev 0)
+++ trunk/configuration2/configuration.php 2007-08-29 20:27:42 UTC (rev 181)
@@ -0,0 +1,113 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
+<title>Configuration d'Easybox</title>
+<link href="template.css" rel="stylesheet" type="text/css">
+<script type="text/javascript" src="script.js"></script>
+
+</head>
+<body>
+<center>
+ <div style="align:center;width:1100px;"><img src="images/haut.png" border="0">
+ <div id="content" class="blocres">
+<?php
+ // R\xE9cup\xE9ration des libs
+ //require_once('verif_config.php');
+ require_once('../_framework/fonctions_partagees.inc.php');
+ require_once('../_framework/lib/ini.php');
+
+ // Construction du menu
+ $titre=array(array('titre'=>'Options générales','smenu'=>array(array('titre'=>'Options principales','lien'=>'configuration.php?page=gen&cat=explorateur','desc'=>'Régler ici les dossiers o\xF9 se trouvent vos fichiers et les options élémentaires.','img'=>'general.png'),
+ array('titre'=>'Multimédia','lien'=>'configuration.php?page=gen&cat=multimedia','desc'=>'Ajuster les qualités d\'encodage, les orties audios...','img'=>'multimedia.png'),
+ array('titre'=>'Mail','lien'=>'configuration.php?page=gen&cat=mail','desc'=>'Définir le compte mail qui devra \xEAtre relevé dans le module mail d\'Easybox.','img'=>'mail.png'),
+// array('titre'=>'Messagerie','lien'=>'configuration.php?page=gen&cat=messagerie'),
+ array('titre'=>'Mises à jour','lien'=>'configuration.php?page=gen&cat=download','desc'=>'Activer ou désactiver les mises à jour automatiques.','img'=>'maj.png'),
+ array('titre'=>'Raccourcis télécommande','lien'=>'configuration.php?page=gen&cat=favoris','desc'=>'Configurer la télécommande de la freebox pour lancer facilement certains modules.','img'=>'telecommande.png'),
+// array('titre'=>'Modules','lien'=>''),
+// array('titre'=>'Screensaver','lien'=>''),
+ array('titre'=>'Magnétoscope numérique','lien'=>'configuration.php?page=gen&cat=multiposte','desc'=>'Configurer le module d\'enregistrement d\'Easybox.','img'=>'magnetoscope.png'))),
+ array('titre'=>'Gestion d\'utilisateur','smenu'=>array(array('titre'=>'Gestion des utilisateurs','lien'=>'configuration.php?page=uti','desc'=>'Activer le controle d\'accès, définir les mots de passe.','img'=>'utilisateurs.png'),
+ array('titre'=>'Autorisations d\'accès','lien'=>'configuration.php?page=aut','desc'=>'Définir les autortisations pour chaque utilisateur.','img'=>'autorisations.png'))),
+ array('titre'=>'Skins et modules','smenu'=>array(array('titre'=>'Gestion des modules','lien'=>'','desc'=>'Supprimer et organiser ses modules.','img'=>'module.png'),
+ array('titre'=>'Gestion des skins','lien'=>'','desc'=>'Supprimer, organiser et activer ses skins.','img'=>'skin.png'),
+ array('titre'=>'Ajout d\'un module','lien'=>'configuration.php?page=addmodule','desc'=>'Installer des modules supplémentaires manuellement.','img'=>'addmodule.png'),
+ array('titre'=>'Ajout d\'un skin','lien'=>'configuration.php?page=addskin','desc'=>'Installer des skins supplémentaires manuellement.','img'=>'skin.png'))),
+ array('titre'=>'Mes médias','smenu'=>array(array('titre'=>'Scan vidéo','lien'=>'configuration.php?page=scanvideo','desc'=>'Scanner ses disques à la recherche de fichiers vidéos et récupérer les fiches depuis internet.','img'=>'video.png'),
+ array('titre'=>'Scan audio','lien'=>'configuration.php?page=scanaudio','desc'=>'Scanner ses disques à la recherche de fichiers audios et récupérer les tags ID3.','img'=>'audio.png'),
+ array('titre'=>'Importer des bases de données','lien'=>'','desc'=>'Importer des bases de données de médias externes (Ant Movie...).','img'=>'importer.png'),
+ array('titre'=>'Podcasts','lien'=>'configuration.php?page=pod','desc'=>'Gérer ses podcasts.','img'=>'podcast.png'),
+ array('titre'=>'RSS','lien'=>'','desc'=>'Gérer ses flux rss.','img'=>'RSS.png'),
+ array('titre'=>'Webradios','lien'=>'','desc'=>'Gérer ses webradios.','img'=>'webradio.png'),
+ array('titre'=>'WebTVs','lien'=>'','desc'=>'Gérer ses WebTVs.','img'=>'webtv.png'),
+ array('titre'=>'Gestion de la bibliothéque vidéo','lien'=>'configuration.php?page=bib','desc'=>'Modifier manuellement sa bibliothèque vidéo.','img'=>'bibvideo.png'))),
+ array('titre'=>'Agenda','smenu'=>array(array('titre'=>'Gestion de l\'agenda','lien'=>'','img'=>'agenda.png'))),
+ array('titre'=>'Site web d\'Easybox','smenu'=>array(array('titre'=>'Forum','lien'=>'http://www.easybox-mod.org/forums/index.php','img'=>'easybox.png','target'=>'_blank','desc'=>'Discuter du développement d\'Easybox ou demander de l\'assistance.'),
+ array('titre'=>'Skins','lien'=>'http://www.easybox-mod.org/index.php?/addon/Skin/','target'=>'_blank','img'=>'skin.png','desc'=>'Télécharger de nouveaux skins.'),
+ array('titre'=>'Modules','lien'=>'http://www.easybox-mod.org/index.php?/addon/Module/','target'=>'_blank','img'=>'addmodule.png','desc'=>'Télécharger de nouveaux modules.'),
+ array('titre'=>'Site','lien'=>'http://www.easybox-mod.org','img'=>'easybox.png','target'=>'_blank','desc'=>'Accéder au site officiel d\'Easybox pour y suivre l\'actualité du mod.'))));
+
+ $i = 0;
+ foreach($titre as $t){
+ echo '<div class="titrerec"><div class="coin gh"> </div><div class="titre" id="titre">'.$t['titre'].'</div><div class="coin dh"> </div></div><div class="res">';
+ foreach($t['smenu'] as $s){
+ if(isset($s['target'])){
+ $target = $s['target'];
+ }else{
+ $target = '_self';
+ }
+ echo '<a class="resultat" OnMouseOut="cacher_comment('.$i.');" OnMouseOver="affich_comment('.$i.');" target="'.$target.'" href="'.$s['lien'].'" style="line-height:16px;"><img src="images/'.$s['img'].'" style="float:left;border:none;margin-right:2px;">'.$s['titre'].'<br><span id="com'.$i.'" style="display:none;color:black;font-size:10px;">'.$s['desc'].'</span></a>';
+ $i++;
+ }
+ echo '</div><div class="titrerecb"><div class="coin gb"> </div><div class="titre"> </div><div class="coin db"> </div></div>';
+ }
+
+?>
+
+
+ </div>
+ <div class="blocvideo">
+
+<?php
+
+(isset($_GET['page'])?$page=$_GET['page']:$page='gen');
+
+switch($page){
+ case 'gen':
+ include('general.php');
+ break;
+ case 'uti':
+ include('utilisateurs.php');
+ break;
+ case 'aut':
+ include('autorisations.php');
+ break;
+ case 'addskin':
+ include('addskin.php');
+ break;
+ case 'addmodule':
+ include('addmodule.php');
+ break;
+ case 'scanvideo':
+ include('scanvideo.html');
+ break;
+ case 'scanaudio':
+ include('scanaudio.html');
+ break;
+ case 'bib':
+ include('bibliotheque.php');
+ break;
+ case 'pod':
+ include('podcast.php');
+ break;
+ default:
+ break;
+}
+
+?>
+
+ </div>
+</div>
+
+</center>
+</body></html>
Added: trunk/configuration2/edituser.php
===================================================================
Added: trunk/configuration2/general.php
===================================================================
--- trunk/configuration2/general.php (rev 0)
+++ trunk/configuration2/general.php 2007-08-29 20:27:42 UTC (rev 181)
@@ -0,0 +1,179 @@
+<?
+$CONFIG_INI = "../_utilisateur/configuration.ini";
+$xml = simplexml_load_file('config.xml');
+
+$USER = '../_utilisateur/';
+$MOD = get_all_module();
+
+//variables initiales pour les navigateurs
+$repinitial = ereg_replace("[\\]","/",strtolower(realpath("../../../../../../../../../..")));
+
+$ini_class = new INI($CONFIG_INI);
+
+(isset($_GET['cat'])?$cat=$_GET['cat']:$cat='explorateur');
+
+// Recherche du titre
+foreach($titre[0]['smenu'] as $e){
+ if(str_replace('configuration.php?page=gen&cat=','',$e['lien'])==$cat){
+ $titre=$e['titre'];
+ }
+}
+
+echo '<div class="titrerec titrereclarger"><div class="coin gh"> </div><div class="titre titrelarger" id="titre">'.$titre.'</div><div class="coin dh"> </div></div><div class="res2">';
+$j = 0;
+
+// Affichage des champs du formulaire
+foreach($xml->channel->categorie as $cate){
+ $catnom = strval($cate['name']);
+ if($cate['name']==$cat){
+ $total = 0;
+ foreach($cate->souscat as $scate){
+ $total++;
+ $nom = strval($scate['name']);
+ $entry = $ini[$catnom][$nom];
+ $desc = $scate->name;
+ $type = $scate->type;
+ $typeplus = $scate->typeplus;
+
+ echo '<div class="item"><div style="width:40%;float:left;">'.$desc.'</div><div style="margin-left:40px;width:60%;">';
+
+
+ switch($type){
+ // Case d'un bool\xE9en
+ case 'boolean':
+ echo '<input type="radio" name="'.$catnom.'|'.$nom.'" id="oui'.$j.'" value="oui" ';
+ if($entry=="oui") echo 'checked="checked"';
+ echo '>Oui<input type="radio" name="'.$catnom.'|'.$nom.'" id="non'.$j.'" value="non"';
+ if($entry=="non") echo 'checked="checked"';
+ echo '>Non<br>';
+ $js .= 'save_boolean("'.$catnom.'","'.$nom.'","oui'.$j.'","non'.$j.'");';
+ break;
+
+ // Cas d'un mot de passe
+ case 'password':
+ ($typeplus=='numeric'?$num="onKeypress=\"if(event.keyCode > 31 && (event.keyCode < 45 || event.keyCode > 57)) event.returnValue = false; if(event.which > 31 && (event.which < 45 || event.which > 57)) return false;\"":$num="");
+ echo '<input name="'.$catnom.'|'.$nom.'" id="'.$catnom.'|'.$nom.'" type="password" autocomplete="off" '.$num.' size="'.(strlen(htmlspecialchars($entry))+5).'" value="'.$entry.'"><script language="javascript">setTimeout("document.getElementById(\''.$catnom.'|'.$nom.'\').value = \''.$entry.'\';",50);</script>';
+ $js .= 'set_ini("'.$catnom.'","'.$nom.'",document.getElementById("'.$catnom.'|'.$nom.'").value);';
+ break;
+
+ // Cas d'un choix de dossier
+ case 'navigateur':
+ $repini = '';
+ $table = explode("|",$entry);
+ echo '<table><tr><td><select onchange="maj(\''.$catnom.'|'.$nom.'\')" size="8" style="width:400px;" name="list'.$catnom.'|'.$nom.'" id="list'.$catnom.'|'.$nom.'" multiple="multiple">';
+
+ foreach($table as $line){
+ if($repini==''){$repini=$line;}
+ echo '<option value="'.$line.'">'.$line.'</option>';
+ }
+
+ echo '</select></td><td><br>
+ <input type="button" value="↑" onClick="TriListe(\''.$catnom.'|'.$nom.'\',\'-\');"><br>
+ <input type="button" value="-" onClick="effacer(\''.$catnom.'|'.$nom.'\');"><br>
+ <input type="button" value="+" onClick="typ=\''.$nom.'\';idNom=\''.$catnom.'|'.$nom.'\';affich_dir(\''.$repini.'\');"><br>
+ <input type="button" value="↓" onClick="TriListe(\'$key|$subkey\',\'+\')">
+ </td></tr></table>
+ <input name="'.$catnom.'|'.$nom.'" id="'.$catnom.'|'.$nom.'" type="hidden" size="20000" value="">';
+ $js .= 'set_ini("'.$catnom.'","'.$nom.'",document.getElementById("'.$catnom.'|'.$nom.'").value);';
+ break;
+
+ // Cas du choix du lecteur DVD
+ case 'dvd':
+ if (PHP_OS == "WIN32" || PHP_OS == "WINNT") {
+ echo '<select name="'.$catnom.'|'.$nom.'" id="'.$catnom.'|'.$nom.'" size="1">';
+ $lecteur=array("b","c","d","e","f","g","h","i","j","k","l","m","n","o","p","q","r","s","t","u","v","w","x","y","z");
+ for ($n=0;$n<=25; $n++){
+ if(@is_dir($lecteur[$n].':/')){
+ ($entry==($lecteur[$n].':')?$selected=" SELECTED":$selected="");
+ echo '<option'.$selected.' value="'.$lecteur[$n].':">'.$lecteur[$n].':</option>';
+ }
+ }
+ echo '</select>';
+ }else{
+ echo '<input name="'.$catnom.'|'.$nom.'" id="'.$catnom.'|'.$nom.'" type="text" size="20" value="'.$entry.'">
+ <input type="button" value="+" onClick="window.open(\'nav.php?form=form1&textfield='.$catnom.'|'.$nom.'&action=directory|'.$ext.'&chemin='.$repinitial.'\',\'_blank\',\'toolbar=0,location=0,directories=0,status=0,scrollbars=1,resizable=0,copyhistory=0,menuBar=0,width=800,height=450\')" /><br>';
+ }
+ $js .= 'set_ini("'.$catnom.'","'.$nom.'",document.getElementById("'.$catnom.'|'.$nom.'").value);';
+ break;
+
+ // Cas d'un choix multiple
+ case 'options':
+ echo '<select name="'.$catnom.'|'.$nom.'" id="'.$catnom.'|'.$nom.'" size="1">';
+
+ foreach($scate->option->choix as $choix){
+ echo '<option value="'.utf8_decode($choix->titre).'"';
+ if($entry==utf8_decode($choix->titre)) echo 'selected';
+ echo '>'.utf8_decode($choix->nom).'</option>';
+ }
+ echo '</select>';
+ $js .= 'set_ini("'.$catnom.'","'.$nom.'",document.getElementById("'.$catnom.'|'.$nom.'").value);';
+ break;
+
+ // Raccourcis de la t\xE9l\xE9commande
+ case 'telecomande':
+ $i=1;
+ echo '<select name="'.$catnom.'|'.$nom.'" id="'.$catnom.'|'.$nom.'" size="1">';
+ echo '<option value="."';
+ if($entry==".") { echo 'selected'; }
+ echo '>Non Utilisé</option>';
+
+ foreach($MOD as $module){
+ echo '<option value="'.$module['repertoire'].$module['lien'].'"';
+ if($entry==$module['repertoire'].$module['lien']) { echo 'selected'; }
+ echo '>'.htmlentities($module['nom']).'</option>';
+ }
+
+ $db = sqlite_open('../_utilisateur/utilisateur.db', 0666);
+ $query = "SELECT * FROM favoris";
+ $result=sqlite_query($db, $query);
+
+ while ($row = sqlite_fetch_array($result)) {
+ echo '<option value="'.$row['lien'].'" ';
+ if($entry==$row['lien']) { echo 'selected'; }
+ echo '>'.stripslashes($row['lien']).'</option>';
+ }
+ echo '</select>';
+ $js .= 'set_ini("'.$catnom.'","'.$nom.'",document.getElementById("'.$catnom.'|'.$nom.'").value);';
+ break;
+
+ // Cas de base : textbox
+ default:
+ ($typeplus=='numeric'?$num="onKeypress=\"if(event.keyCode > 31 && (event.keyCode < 45 || event.keyCode > 57)) event.returnValue = false; if(event.which > 31 && (event.which < 45 || event.which > 57)) return false;\"":$num="");
+ echo '<input name="'.$catnom.'|'.$nom.'" id="'.$catnom.'|'.$nom.'" type="text" autocomplete="off" '.$num.' size="';
+ echo strlen(htmlspecialchars($entry))+10;
+ echo '" value="'.$entry.'"><script language="javascript">setTimeout("document.getElementById(\''.$catnom.'|'.$nom.'\').value = \''.$entry.'\';",50);</script><br>';
+ $js .= 'set_ini("'.$catnom.'","'.$nom.'",document.getElementById("'.$catnom.'|'.$nom.'").value);';
+ break;
+
+
+ }
+ echo '</div></div>';
+ if(((++$j % 3)==0 AND $i>0) OR $j==count($cate->xpath('souscat/'))){
+ echo '<a class="enregistrer" style="cursor:pointer;" onclick="save();"><img src="images/disquette.png" class="icone" style="width:30px;height:30px;">Enregistrer</a>';
+ }
+
+ }
+ }
+}
+ echo '</div><div class="titrerecb titrerecblarger"><div class="coin gb"> </div><div class="titre titrelarger"> </div><div class="coin db"> </div></div>';
+
+
+ echo '<script language="javascript">var suc=0;function save(){'.$js.'}function addsucces(){suc=suc+1;if(suc=='.$total.'){alert("Configuration enregistr\xE9e avec succ\xE8s");}}</script>';
+
+
+
+?>
+
+<div id="explor" style="position:absolute;top:0px;left:0px;visibility:hidden;width:860px;height:550px;">
+Explorateur de fichiers
+</div>
+
+<script language="javascript">
+maj('explorateur|films_defaut');
+maj('explorateur|photos_defaut');
+maj('explorateur|audio_defaut');
+fix_position_dir('explor');
+
+
+</script>
+
Added: trunk/configuration2/get_utilisateur.php...
[truncated message content] |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X