You can subscribe to this list here.
2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(5) |
Oct
(26) |
Nov
(10) |
Dec
(7) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2007 |
Jan
(7) |
Feb
(17) |
Mar
(25) |
Apr
(8) |
May
(33) |
Jun
(11) |
Jul
(1) |
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(2) |
Aug
(68) |
Sep
(2) |
Oct
|
Nov
|
Dec
|
From: <cra...@us...> - 2007-06-03 23:42:50
|
Revision: 178 http://svn.sourceforge.net/easybox-mod/?rev=178&view=rev Author: craftsnux Date: 2007-06-03 16:42:39 -0700 (Sun, 03 Jun 2007) Log Message: ----------- Utilisation de img2fbx pour afficher les jaquettes. Le fichier jaquette.php est remplace par une fonction jaquette qui cherche juste l'url de l'image et l'envoi ?\195?\160 img2fbx. Les fichiers peuvent maintenant ?\195?\170tre jpg png ou gif Modified Paths: -------------- trunk/module/mp3/audio.tpl trunk/module/mp3/lecteuraudio.php Removed Paths: ------------- trunk/module/mp3/jaquette.php Modified: trunk/module/mp3/audio.tpl =================================================================== --- trunk/module/mp3/audio.tpl 2007-06-02 21:05:12 UTC (rev 177) +++ trunk/module/mp3/audio.tpl 2007-06-03 23:42:39 UTC (rev 178) @@ -94,7 +94,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} Deleted: trunk/module/mp3/jaquette.php =================================================================== --- trunk/module/mp3/jaquette.php 2007-06-02 21:05:12 UTC (rev 177) +++ trunk/module/mp3/jaquette.php 2007-06-03 23:42:39 UTC (rev 178) @@ -1,92 +0,0 @@ -<?php -function Get_Extension_From_File($Filename) { - $Extension = explode (".", $Filename); - $Extension_i = (count($Extension) - 1); - return strtoupper($Extension[$Extension_i]); -} - -if (isset($_GET['h'])) - $h = $_GET['h']; -else -$h="80"; - -if (isset($_GET['w'])) -$w = $_GET['w']; -else -$w="80"; - -if (isset($_GET['directory'])) - $rep = realpath(urldecode($_GET['directory'])); -if($handlejpg = @opendir($rep)){ - $i=0; - while (false !== ($jpg = readdir($handlejpg))){ - if ($jpg!='.' && $jpg!='..' && eregi('.jpg', $jpg) or eregi('.jpeg', $jpg) ){ - $fichierjpg[$i]=$jpg; - $i++; - } - } - closedir($handlejpg); -} - -if (count($fichierjpg)=="0"){ - $info=$_GET['info']; - if($info!='' && $pagerecherche = file_get_contents('http://images.google.fr/images?q='.urlencode($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})"\);'; - preg_match_all("/$ereg/s", $pagerecherche, $valeur); - $img_selected = rand(0,(floor(count($valeur[2])/3))); - $img=$valeur[9][$img_selected].'?q=tbn:'.$valeur[2][$img_selected]; - $image = imagecreatefromjpeg($img); - }else{ - if ($_GET['lec'] == "webradio") { - $img=realpath("./temp/radio.gif"); - }else{ - $img=realpath("./temp/pasdimage.gif"); - } - $image = imagecreatefromgif($img); - } - - $refaire="0"; - - -}elseif(count($fichierjpg)=="1"){ - $img=$rep.'/'.$fichierjpg[0]; - $image = imagecreatefromjpeg($img); -}else{ -foreach($fichierjpg as $pls){ - if(eregi('front',$pls)){ - $img=$rep.'/'.$pls; - $image = imagecreatefromjpeg($img); - break; - } -} -if($img==""){ - $img=$rep.'/'.$fichierjpg[0]; - $image = imagecreatefromjpeg($img); - } -} - -function imageajuste(&$image1,$image2,$largeur,$hauteur){ - $pourcent=min (min(($largeur/imagesx($image2)),1),min(($hauteur/imagesy($image2)),1)); - $redimx=floor(imagesx($image2)*$pourcent); - $redimy=floor(imagesy($image2)*$pourcent); - $image1 = imagecreatetruecolor($redimx, $redimy); -imagecopyresized($image1,$image2,$px,$py, 0, 0, round($redimx),round($redimy), imagesx($image2),imagesy($image2)); -} - -if($w==80 and $h==80){ -list($width, $height) = getimagesize($img); -$im = ImageCreateTrueColor($w,$h); -imagecopyresized($im,$image,0, 0, 0, 0,$w,$h,$width,$height); -}else{ -imageajuste($im, $image, $w, $h); -} - -//Format de l'image: gif -header ("Content-type: image/gif"); -imagedestroy($image); -ImageTrueColorToPalette( $im, false, 170 ); -imagegif($im); -imagedestroy($im); -?> Modified: trunk/module/mp3/lecteuraudio.php =================================================================== --- trunk/module/mp3/lecteuraudio.php 2007-06-02 21:05:12 UTC (rev 177) +++ trunk/module/mp3/lecteuraudio.php 2007-06-03 23:42:39 UTC (rev 178) @@ -1,5 +1,53 @@ <?php +function jaquette($Directory,$Lec,$Info){ +if (isset($Directory)) + $rep = realpath(urldecode($Directory)); +if($handleimg = @opendir($rep)){ + $i=0; + while (false !== ($fichimg = readdir($handleimg))){ + if ($fichimg!='.' && $fichimg!='..' && (eregi('.jpg', $fichimg) || eregi('.jpeg', $fichimg) || eregi('.png', $fichimg)|| eregi('.gif', $fichimg))){ + $fichierimg[$i]=$fichimg; + $i++; + } + } + closedir($handleimg); +} +if (count($fichierimg)=="0"){ + if($Info!='' && $pagerecherche = file_get_contents('http://images.google.fr/images?q='.urlencode($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})"\);'; + preg_match_all("/$ereg/s", $pagerecherche, $valeur); + $img_selected = rand(0,(floor(count($valeur[2])/3))); + $img=$valeur[9][$img_selected].'?q=tbn:'.$valeur[2][$img_selected]; + }else{ + if ($Lec == "webradio") { + $img=realpath("./temp/radio.gif"); + }else{ + $img=realpath("./temp/pasdimage.gif"); + } + + } + + $refaire="0"; + + +}elseif(count($fichierimg)=="1"){ + $img=$rep.'/'.$fichierimg[0]; +}else{ +foreach($fichierimg as $pls){ + if(eregi('front',$pls)){ + $img=$rep.'/'.$pls; + break; + } +} +if($img==""){ + $img=$rep.'/'.$fichierimg[0]; + } +} +return $img; +} $RACINE_REP = "../../"; require($RACINE_REP.'_framework/framework.php'); if(isset($_GET['type']) or isset($_GET['wfp']) or isset($_GET['wlp']) or isset($_GET['playall']) or isset($_GET['addall']) or isset($_GET['toplay']) or isset($_GET['toplay_file'])){ @@ -286,6 +334,8 @@ } +$jaquette=jaquette(urlencode(dirname($VLC['url_current'])),$VLC['type_current'],urlencode(trim($search))); +$smarty->assign('jaquette',$jaquette); if($mode=='pla'){ $smarty->assign('playlists',glob($PLAYLIST."*.m3u")); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ara...@us...> - 2007-06-02 21:05:13
|
Revision: 177 http://svn.sourceforge.net/easybox-mod/?rev=177&view=rev Author: aragornis Date: 2007-06-02 14:05:12 -0700 (Sat, 02 Jun 2007) Log Message: ----------- - t?\195?\169l?\195?\169sites presque compl?\195?\169tement fonctionnels - r?\195?\169paration d'un pti bug sur la gestion multipage du catalogue audio Modified Paths: -------------- trunk/module/mp3/catalogue.php trunk/module/telesites/index1.php Modified: trunk/module/mp3/catalogue.php =================================================================== --- trunk/module/mp3/catalogue.php 2007-06-02 13:10:16 UTC (rev 176) +++ trunk/module/mp3/catalogue.php 2007-06-02 21:05:12 UTC (rev 177) @@ -116,7 +116,7 @@ $smarty->assign('rows',$RESULT); sqlite_close($db); - start_multi('lecteuraudio.php?mode=bib&t='.$type.'&l='.$l.'&wf='.$wherefield.'&wl='.$wherelike,10,$rows); + start_multi('lecteuraudio.php?mode=bib&t='.$type.'&l='.$letter.'&wf='.$wherefield.'&wl='.$wherelike,10,$rows); $smarty->assign('CONTENT',$smarty->fetch('catalogue_audio.tpl')); } Modified: trunk/module/telesites/index1.php =================================================================== --- trunk/module/telesites/index1.php 2007-06-02 13:10:16 UTC (rev 176) +++ trunk/module/telesites/index1.php 2007-06-02 21:05:12 UTC (rev 177) @@ -32,12 +32,21 @@ $base = $sites[$_GET['siteid']]['url']; } -$contenu = file_get_contents($base); +$contenu = stripslashes(file_get_contents($base)); $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); +function formaterurl($url){ +global $info_url; + if(eregi('http://',$url)){ + return false; + }elseif(substr($url,0,1)=='/'){ + return urlencode('http://'.$info_url['host']); + }else{ + return urlencode('http://'.$info_url['host'].$info_url['dir'].'/'); + } +} +$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); $ereg = '<source>(.{1,800})<\/source>'; @@ -50,14 +59,17 @@ $xml = simplexml_load_string($commandes); $xml2 = simplexml_load_string($commandes2); + +if($res2 = @$xml2->xpath('/backgroundContent/settings')){ +$forcerimage = $res2[0]['stopCurrentlyPlaying']; +} 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-02 13:10:20
|
Revision: 176 http://svn.sourceforge.net/easybox-mod/?rev=176&view=rev Author: craftsnux Date: 2007-06-02 06:10:16 -0700 (Sat, 02 Jun 2007) Log Message: ----------- skin multimedia:le menu tournant fonctionne avec freebox 4 Modified Paths: -------------- trunk/skin/mediacenter/menu.tpl Modified: trunk/skin/mediacenter/menu.tpl =================================================================== --- trunk/skin/mediacenter/menu.tpl 2007-06-02 12:46:33 UTC (rev 175) +++ trunk/skin/mediacenter/menu.tpl 2007-06-02 13:10:16 UTC (rev 176) @@ -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=="5"}service{else}location{/if}="srv://default?ox=0&oy=0&ow=720&oh=576,&ix=0&iy=0&iw=360&ih=192";' href="../../module/films/index1.php"> + <a focused onfocus='front_panel="FILMS";{if $vers_fbx=="5"}service="srv://default{else}location="ts://127.0.0.1{/if}?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=="5"}service{else}location{/if}="srv://default?ox=0&oy=0&ow=720&oh=576,&ix=0&iy=384&iw=360&ih=192";' href="../../module/_menu/menu.php?show=1"> + <a onfocus='front_panel="MODULES";{if $vers_fbx=="5"}service="srv://default{else}location="ts://127.0.0.1{/if}?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=="5"}service{else}location{/if}="srv://default?ox=0&oy=0&ow=720&oh=576,&ix=360&iy=192&iw=360&ih=192";' href="../../module/diaporama/index1.php"> + <a onfocus='front_panel="PHOTO";{if $vers_fbx=="5"}service="srv://default{else}location="ts://127.0.0.1{/if}?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=="5"}service{else}location{/if}="srv://default?ox=0&oy=0&ow=720&oh=576,&ix=0&iy=192&iw=360&ih=192";' href="../../module/mp3/lecteuraudio.php"> + <a onfocus='front_panel="AUDIO";{if $vers_fbx=="5"}service="srv://default{else}location="ts://127.0.0.1{/if}?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=="5"}service{else}location{/if}="srv://default?ox=0&oy=0&ow=720&oh=576,&ix=360&iy=0&iw=360&ih=192";' href="../../module/films/catalogue.php"> + <a onfocus='front_panel="BIBLIOTHEQUE";{if $vers_fbx=="5"}service="srv://default{else}location="ts://127.0.0.1{/if}?ox=0&oy=0&ow=720&oh=576,&ix=360&iy=0&iw=360&ih=192";' href="../../module/films/catalogue.php"> </a> {/if} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ara...@us...> - 2007-06-02 12:46:35
|
Revision: 175 http://svn.sourceforge.net/easybox-mod/?rev=175&view=rev Author: aragornis Date: 2007-06-02 05:46:33 -0700 (Sat, 02 Jun 2007) Log Message: ----------- voila ! Modified Paths: -------------- trunk/skin/mediacenter/menu.tpl Modified: trunk/skin/mediacenter/menu.tpl =================================================================== --- trunk/skin/mediacenter/menu.tpl 2007-06-02 12:44:30 UTC (rev 174) +++ trunk/skin/mediacenter/menu.tpl 2007-06-02 12:46:33 UTC (rev 175) @@ -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 substr($vers_fbx,0,1)=="5"}service{else}location{/if}="srv://default?ox=0&oy=0&ow=720&oh=576,&ix=0&iy=0&iw=360&ih=192";' href="../../module/films/index1.php"> + <a focused onfocus='front_panel="FILMS";{if $vers_fbx=="5"}service{else}location{/if}="srv://default?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 substr($vers_fbx,0,1)=="5"}service{else}location{/if}="srv://default?ox=0&oy=0&ow=720&oh=576,&ix=0&iy=384&iw=360&ih=192";' href="../../module/_menu/menu.php?show=1"> + <a onfocus='front_panel="MODULES";{if $vers_fbx=="5"}service{else}location{/if}="srv://default?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 substr($vers_fbx,0,1)=="5"}service{else}location{/if}="srv://default?ox=0&oy=0&ow=720&oh=576,&ix=360&iy=192&iw=360&ih=192";' href="../../module/diaporama/index1.php"> + <a onfocus='front_panel="PHOTO";{if $vers_fbx=="5"}service{else}location{/if}="srv://default?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 substr($vers_fbx,0,1)=="5"}service{else}location{/if}="srv://default?ox=0&oy=0&ow=720&oh=576,&ix=0&iy=192&iw=360&ih=192";' href="../../module/mp3/lecteuraudio.php"> + <a onfocus='front_panel="AUDIO";{if $vers_fbx=="5"}service{else}location{/if}="srv://default?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 substr($vers_fbx,0,1)=="5"}service{else}location{/if}="srv://default?ox=0&oy=0&ow=720&oh=576,&ix=360&iy=0&iw=360&ih=192";' href="../../module/films/catalogue.php"> + <a onfocus='front_panel="BIBLIOTHEQUE";{if $vers_fbx=="5"}service{else}location{/if}="srv://default?ox=0&oy=0&ow=720&oh=576,&ix=360&iy=0&iw=360&ih=192";' href="../../module/films/catalogue.php"> </a> {/if} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ara...@us...> - 2007-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: <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: <cra...@us...> - 2007-06-01 14:45:16
|
Revision: 172 http://svn.sourceforge.net/easybox-mod/?rev=172&view=rev Author: craftsnux Date: 2007-06-01 07:45:15 -0700 (Fri, 01 Jun 2007) Log Message: ----------- Modified Paths: -------------- trunk/_framework/fonctions_partagees.inc.php trunk/_framework/framework.php trunk/skin/mediacenter/menu.tpl Modified: trunk/_framework/fonctions_partagees.inc.php =================================================================== --- trunk/_framework/fonctions_partagees.inc.php 2007-06-01 13:58:20 UTC (rev 171) +++ trunk/_framework/fonctions_partagees.inc.php 2007-06-01 14:45:15 UTC (rev 172) @@ -7,10 +7,10 @@ // ou le format : // freebox/1.7.3-ppp - if (isset($HTTP_SERVER_VARS['HTTP_X_BOX_USER_AGENT']) $userboxagent = + 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 = + if (isset($HTTP_SERVER_VARS['HTTP_BOX_USER_AGENT'])) $userboxagent = $HTTP_SERVER_VARS['HTTP_BOX_USER_AGENT']; if (isset($userboxagent)) Modified: trunk/_framework/framework.php =================================================================== --- trunk/_framework/framework.php 2007-06-01 13:58:20 UTC (rev 171) +++ trunk/_framework/framework.php 2007-06-01 14:45:15 UTC (rev 172) @@ -54,7 +54,7 @@ $LOAD = $FRAMEWORK_REP.'fonctions_partagees.inc.php'; require_once($LOAD); // version de freebox - $info_fbx=fbx_GetBoxUserAgent(); + $info_fbx=fbx_GetBoxUserAgent(); $vers_fbx =$info_fbx['version']; $EXPLORATEUR = $MODULE.'_explorateur/index1.php'; Modified: trunk/skin/mediacenter/menu.tpl =================================================================== --- trunk/skin/mediacenter/menu.tpl 2007-06-01 13:58:20 UTC (rev 171) +++ trunk/skin/mediacenter/menu.tpl 2007-06-01 14:45:15 UTC (rev 172) @@ -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{0}==5}service{else}location{/if}="srv://default?ox=0&oy=0&ow=720&oh=576,&ix=0&iy=0&iw=360&ih=192";' href="../../module/films/index1.php"> + <a focused onfocus='front_panel="FILMS";{if substr($vers_fbx,0,1)=="5"}service{else}location{/if}="srv://default?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{0}==5}service{else}location{/if}="srv://default?ox=0&oy=0&ow=720&oh=576,&ix=0&iy=384&iw=360&ih=192";' href="../../module/_menu/menu.php?show=1"> + <a onfocus='front_panel="MODULES";{if substr($vers_fbx,0,1)=="5"}service{else}location{/if}="srv://default?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{0}==5}service{else}location{/if}="srv://default?ox=0&oy=0&ow=720&oh=576,&ix=360&iy=192&iw=360&ih=192";' href="../../module/diaporama/index1.php"> + <a onfocus='front_panel="PHOTO";{if substr($vers_fbx,0,1)=="5"}service{else}location{/if}="srv://default?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{0}==5}service{else}location{/if}="srv://default?ox=0&oy=0&ow=720&oh=576,&ix=0&iy=192&iw=360&ih=192";' href="../../module/mp3/lecteuraudio.php"> + <a onfocus='front_panel="AUDIO";{if substr($vers_fbx,0,1)=="5"}service{else}location{/if}="srv://default?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{0}==5}service{else}location{/if}="srv://default?ox=0&oy=0&ow=720&oh=576,&ix=360&iy=0&iw=360&ih=192";' href="../../module/films/catalogue.php"> + <a onfocus='front_panel="BIBLIOTHEQUE";{if substr($vers_fbx,0,1)=="5"}service{else}location{/if}="srv://default?ox=0&oy=0&ow=720&oh=576,&ix=360&iy=0&iw=360&ih=192";' href="../../module/films/catalogue.php"> </a> {/if} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cra...@us...> - 2007-06-01 13:58:21
|
Revision: 171 http://svn.sourceforge.net/easybox-mod/?rev=171&view=rev Author: craftsnux Date: 2007-06-01 06:58:20 -0700 (Fri, 01 Jun 2007) Log Message: ----------- compatibilite du skin mediacenter avec la fbx 4 a verifier pour la HD Modified Paths: -------------- trunk/_framework/fonctions_partagees.inc.php trunk/_framework/framework.php trunk/skin/mediacenter/menu.tpl Modified: trunk/_framework/fonctions_partagees.inc.php =================================================================== --- trunk/_framework/fonctions_partagees.inc.php 2007-06-01 11:19:14 UTC (rev 170) +++ trunk/_framework/fonctions_partagees.inc.php 2007-06-01 13:58:20 UTC (rev 171) @@ -1,5 +1,45 @@ <?php +function fbx_GetBoxUserAgent() +{ + // 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 + // ou le format : + // freebox/1.7.3-ppp + 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($userboxagent)) + { + // Nouveau format de useragent + if (preg_match('/(.*)\/(.*) \(hw:(.*); sw:(.*)\) ifc:(.*)/', $box_user_agent, $regs)) + { + $boxinfo['name'] = $regs[1]; + $boxinfo['version'] = $regs[2]; + $boxinfo['firmware'] = $regs[3]; + $boxinfo['browser_version'] = $regs[4]; + $boxinfo['ifc'] = $regs[5]; + } + else + { + preg_match('/(.*)\/(.*)/', $box_user_agent, $regs); + + $boxinfo['name'] = $regs[1]; + $boxinfo['version'] = "x.x"; + $boxinfo['firmware'] = $regs[2]; + $boxinfo['browser_version'] = "#"; + $boxinfo['ifc'] = "#"; + } + + $boxinfo['shortdesc'] = $boxinfo['name'].'_'.$boxinfo['version'].' ('.$boxinfo['firmware'].')'; + } + + return $boxinfo; +} //Fonction permettant de lire un fichier function play_fichier($page,$basename, $realpath=1, $type='video', $name='', $duree=0){ global $ini,$USER; Modified: trunk/_framework/framework.php =================================================================== --- trunk/_framework/framework.php 2007-06-01 11:19:14 UTC (rev 170) +++ trunk/_framework/framework.php 2007-06-01 13:58:20 UTC (rev 171) @@ -7,13 +7,6 @@ setlocale(LC_TIME, "fr"); - $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)){ - $vers_fbx = $val_vers[1]; - }else{ - $vers_fbx = 4; - } unset($val_vers); @@ -60,7 +53,10 @@ $smarty->assign('IMG2FBX',$IMG2FBX); $LOAD = $FRAMEWORK_REP.'fonctions_partagees.inc.php'; require_once($LOAD); - +// version de freebox + $info_fbx=fbx_GetBoxUserAgent(); + $vers_fbx =$info_fbx['version']; + $EXPLORATEUR = $MODULE.'_explorateur/index1.php'; $smarty->assign('EXPLORATEUR',$EXPLORATEUR); $PLAYLIST = $USER.'playlist/'; Modified: trunk/skin/mediacenter/menu.tpl =================================================================== --- trunk/skin/mediacenter/menu.tpl 2007-06-01 11:19:14 UTC (rev 170) +++ trunk/skin/mediacenter/menu.tpl 2007-06-01 13:58:20 UTC (rev 171) @@ -8,19 +8,19 @@ {section name=menu loop=$MENU} {if $CAT=="1" AND NOT $SHOW} {if $smarty.section.menu.first} - <a focused onfocus='front_panel="FILMS";service="srv://default?ox=0&oy=0&ow=720&oh=576,&ix=0&iy=0&iw=360&ih=192";' href="../../module/films/index1.php"> + <a focused onfocus='front_panel="FILMS";{if $vers_fbx{0}==5}service{else}location{/if}="srv://default?ox=0&oy=0&ow=720&oh=576,&ix=0&iy=0&iw=360&ih=192";' href="../../module/films/index1.php"> </a> - <a onfocus='front_panel="MODULES";service="srv://default?ox=0&oy=0&ow=720&oh=576,&ix=0&iy=384&iw=360&ih=192";' href="../../module/_menu/menu.php?show=1"> + <a onfocus='front_panel="MODULES";{if $vers_fbx{0}==5}service{else}location{/if}="srv://default?ox=0&oy=0&ow=720&oh=576,&ix=0&iy=384&iw=360&ih=192";' href="../../module/_menu/menu.php?show=1"> </a> - <a onfocus='front_panel="PHOTO";service="srv://default?ox=0&oy=0&ow=720&oh=576,&ix=360&iy=192&iw=360&ih=192";' href="../../module/diaporama/index1.php"> + <a onfocus='front_panel="PHOTO";{if $vers_fbx{0}==5}service{else}location{/if}="srv://default?ox=0&oy=0&ow=720&oh=576,&ix=360&iy=192&iw=360&ih=192";' href="../../module/diaporama/index1.php"> </a> - <a onfocus='front_panel="AUDIO";service="srv://default?ox=0&oy=0&ow=720&oh=576,&ix=0&iy=192&iw=360&ih=192";' href="../../module/mp3/lecteuraudio.php"> + <a onfocus='front_panel="AUDIO";{if $vers_fbx{0}==5}service{else}location{/if}="srv://default?ox=0&oy=0&ow=720&oh=576,&ix=0&iy=192&iw=360&ih=192";' href="../../module/mp3/lecteuraudio.php"> </a> - <a onfocus='front_panel="BIBLIOTHEQUE";service="srv://default?ox=0&oy=0&ow=720&oh=576,&ix=360&iy=0&iw=360&ih=192";' href="../../module/films/catalogue.php"> + <a onfocus='front_panel="BIBLIOTHEQUE";{if $vers_fbx{0}==5}service{else}location{/if}="srv://default?ox=0&oy=0&ow=720&oh=576,&ix=360&iy=0&iw=360&ih=192";' href="../../module/films/catalogue.php"> </a> {/if} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cra...@us...> - 2007-06-01 11:19:17
|
Revision: 170 http://svn.sourceforge.net/easybox-mod/?rev=170&view=rev Author: craftsnux Date: 2007-06-01 04:19:14 -0700 (Fri, 01 Jun 2007) Log Message: ----------- Ajout du test du module xml de php Modified Paths: -------------- trunk/testeur.php Modified: trunk/testeur.php =================================================================== --- trunk/testeur.php 2007-06-01 04:44:56 UTC (rev 169) +++ trunk/testeur.php 2007-06-01 11:19:14 UTC (rev 170) @@ -56,7 +56,8 @@ getSetting('SQLite','SQLite Library', 'Le module SQLite est pr\xE9sent avec la version : ', 'Le module SQLite n\'est pas pr\xE9sent !'); getSetting('zlib','Compiled Version', 'Le module Zlib est pr\xE9sent avec la version : ', 'Le module Zlib n\'est pas pr\xE9sent !'); getSetting('imap','IMAP c-Client Version', 'Le module imap pr\xE9sent avec la version : ', 'Le module imap n\'est pas pr\xE9sent !'); -getSetting('libxml','libXML Version', 'Le module XML pr\xE9sent avec la version : ', 'Le module XML n\'est pas pr\xE9sent !'); +getSetting('libxml','libXML Version', 'Le module libXML pr\xE9sent avec la version : ', 'Le module libXML n\'est pas pr\xE9sent !'); +getSetting('xml','EXPAT Version', 'Le module XML pr\xE9sent avec la version : ', 'Le module XML n\'est pas pr\xE9sent !'); echo "<hr>"; getSetting('Apache Environment','SERVER_SOFTWARE', 'Version du Serveur : ', 'Aucune donn\xE9es sur la version du SERVEUR !'); echo "<hr>"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ara...@us...> - 2007-06-01 04:45:02
|
Revision: 169 http://svn.sourceforge.net/easybox-mod/?rev=169&view=rev Author: aragornis Date: 2007-05-31 21:44:56 -0700 (Thu, 31 May 2007) Log Message: ----------- Avanc?\195?\169es sur le telesite Modified Paths: -------------- trunk/_framework/fonctions_partagees.inc.php trunk/_framework/lib/lib_photo.php trunk/_utilisateur/modules.db trunk/module/telesites/index1.php trunk/module/telesites/telesite.tpl trunk/skin/ETI/menu.tpl Modified: trunk/_framework/fonctions_partagees.inc.php =================================================================== --- trunk/_framework/fonctions_partagees.inc.php 2007-05-31 04:53:08 UTC (rev 168) +++ trunk/_framework/fonctions_partagees.inc.php 2007-06-01 04:44:56 UTC (rev 169) @@ -856,14 +856,19 @@ } // T\xE9l\xE9charge une page internet et la met en cache ou r\xE9cup\xE8re directement son contenu mis en cache -function file_get_contents_cache($adresse, $heures=1){ +function file_get_contents_cache($adresse, $heures=1, $use_include_path=null, $context=null, $offset=null, $maxlen=null){ global $USER, $CACHE_IMAGE; $db = sqlite_open($USER.'cache.db', 0666); $fichier = md5($adresse); clean_cache(); $res = sqlite_query($db,'SELECT * FROM cache WHERE fichier="'.$fichier.'"'); if(sqlite_num_rows($res)>0 AND file_exists($CACHE_IMAGE.$fichier)){ + if(isset($use_include_path)){ + $retour = file_get_contents($CACHE_IMAGE.$fichier,$use_include_path,$context,$offset,$maxlen); + }else{ $retour = file_get_contents($CACHE_IMAGE.$fichier); + } + }else{ $retour = file_get_contents($adresse); file_put_contents($CACHE_IMAGE.$fichier, $retour); Modified: trunk/_framework/lib/lib_photo.php =================================================================== --- trunk/_framework/lib/lib_photo.php 2007-05-31 04:53:08 UTC (rev 168) +++ trunk/_framework/lib/lib_photo.php 2007-06-01 04:44:56 UTC (rev 169) @@ -45,7 +45,10 @@ // Path du fichier en cache var $name_cache; -function __construct($url, $r_width, $r_height, $angle, $cache, $quality){ +var $transparence; + + +function __construct($url, $r_width, $r_height, $angle, $cache, $quality, $transparence=false){ global $_SERVER, $CACHE_IMAGE; $this->url = $url; $this->cache = $cache; @@ -55,7 +58,8 @@ $this->cache = $cache; $this->quality = $quality; $this->hash = md5($this->url.$this->r_height.$this->r_width.$this->angle); - + $this->transparence = $transparence; + define("IMAGE_FLIP_HORIZONTAL", 1); define("IMAGE_FLIP_VERTICAL", 2); define("IMAGE_FLIP_BOTH", 3); @@ -130,27 +134,27 @@ $trans = imagecolortransparent($this->img); if($trans!=-1){ - $trans = imagecolorsforindex($this->img,imagecolortransparent($this->img)); + $this->couleur_fond = imagecolorsforindex($this->img,$trans); } // Tourner $this->tourner(); - + // Redimensionner if($this->r_width!=0 AND $this->r_height!=0){ $this->redimensionner(); } - if($trans!=-1){ - imagecolortransparent($this->img,imagecolorallocate($this->img, $trans['red'], $trans['green'], $trans['blue'])); + if($this->transparence){ + imagetruecolortopalette($this->img, false, 128); + imagecolortransparent($this->img, imagecolorat($this->img, 0, 0)); } - // Mettre en cache if($this->cache){ $this->generer_fichier(); } - + // Renvoyer $this->afficher_image(); @@ -180,12 +184,13 @@ if($pourcent<1){ $redimx = floor($this->width*$pourcent); $redimy = floor($this->height*$pourcent); - $image1 = imagecreatetruecolor($redimx, $redimy); + + $image1 = imagecreatetruecolor($redimx, $redimy); imagesavealpha($image1, true); $trans_colour = imagecolorallocatealpha($image1, 0, 0, 0, 127); imagefill($image1, 0, 0, $trans_colour); imagealphablending($image1, false); - + if($this->quality=='max'){ ImageCopyresampled($image1,$this->img,0,0,0,0,$redimx,$redimy,$this->width,$this->height); }else{ @@ -276,6 +281,6 @@ } -$img = new image(urldecode($_GET['img']), $_GET['width'], $_GET['height'], $_GET['angle'], $_GET['cache'], $_GET['quality']); +$img = new image(urldecode($_GET['img']), $_GET['width'], $_GET['height'], $_GET['angle'], $_GET['cache'], $_GET['quality'], $_GET['transparence']); $img->process(); ?> Modified: trunk/_utilisateur/modules.db =================================================================== (Binary files differ) Modified: trunk/module/telesites/index1.php =================================================================== --- trunk/module/telesites/index1.php 2007-05-31 04:53:08 UTC (rev 168) +++ trunk/module/telesites/index1.php 2007-06-01 04:44:56 UTC (rev 169) @@ -2,10 +2,20 @@ $RACINE_REP = "../../"; require($RACINE_REP.'_framework/framework.php'); +function ParseURLplus($url){ +$URLpcs = (parse_url($url)); +$PathPcs = explode("/",$URLpcs['path']); +$URLpcs['file'] = end($PathPcs); +unset($PathPcs[key($PathPcs)]); +$URLpcs['dir'] = implode("/",$PathPcs); +return ($URLpcs); +} + function parse_sites($xml){ $RES = array(); + $i=0; 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); + $RES[] = array('id'=>$i++,'nom'=>utf8_decode($telesite->name),'url'=>utf8_decode($telesite->url),'weburl'=>utf8_decode($telesite->weburl),'category'=>utf8_decode($telesite->category),'screenshot'=>utf8_decode($telesite->screenshot)); } return $RES; } @@ -13,15 +23,32 @@ $xml = simplexml_load_file_cache('http://www.freeplayer.org/telesite.xml',24); $sites = parse_sites($xml); +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)"); -if(isset($_GET['siteid'])){ $base = $sites[$_GET['siteid']]['url']; -$contenu = file_get_contents_cache($base.'index.php?'.$_SERVER['QUERY_STRING'],24); +$contenu = file_get_contents($base); $contenu = str_replace('src="images/', 'src="'.$IMG2FBX.'?cache=1&img='.urlencode($base.'images/'), $contenu); +$contenu = str_replace('</body>', '<script language="javascript" src="/fb2ie.js"></script></body>', $contenu); +$ereg = '<contentInfo>(.{1,800})<\/contentInfo>'; +preg_match("/$ereg/s", $contenu, $valeur); +$commandes = $valeur[1]; + +$ereg = '<backgroundContent>(.{1,800})<\/backgroundContent>'; +preg_match("/$ereg/s", $contenu, $valeur); +$commandes2 = $valeur[0]; + +$xml = simplexml_load_string($commandes); +$xml2 = simplexml_load_string($commandes2); +$res = $xml->xpath('/hj:imageInfo/source/url'); +$res2 = $xml2->xpath('/backgroundContent/settings'); +$forcerimage = $res2[0]['stopCurrentlyPlaying']; + echo $contenu; + }else{ -$smarty->assign('xml',$xml); +$smarty->assign('SITES',$sites); $smarty->assign('CONTENT',$smarty->fetch('telesite.tpl')); $smarty->display('interface.tpl'); } Modified: trunk/module/telesites/telesite.tpl =================================================================== --- trunk/module/telesites/telesite.tpl 2007-05-31 04:53:08 UTC (rev 168) +++ trunk/module/telesites/telesite.tpl 2007-06-01 04:44:56 UTC (rev 169) @@ -1,71 +1,36 @@ -{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> +{assign var=NUM_ROW_AFFICH value=15} +{section name=site loop=$SITES max=$NUM_ROW_AFFICH start=$START} +{cycle name=place assign=place print=false values="4,3,2,1,0"} + {if $smarty.section.site.first} + <table border="0" cellpadding="0" cellspacing="0" width="500" align="center"><tr> + {if !$_multipage.is_first_page} + <td colspan="5" align=center>{precedent}</td></tr><tr> + {/if} {/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> + + <td width="100" height="150"><a href="index1.php?siteid={$SITES[site].id}"><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="83" height="60" border="0" src="{$IMG2FBX}?img={$SITES[site].screenshot|urlencode}&width=83&height=60&cache=1"></td></tr><tr height="70"><td width="100" height="70" valign="middle" align=center><font size="1">{$SITES[site].nom|truncate:30:"":true|wordwrap:15:"<br>":true}</font></td></tr></table></a></td> - {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> + {if $smarty.section.site.iteration is div by 5 AND NOT $smarty.section.files.last} + </tr><tr> + {/if} + + {if $smarty.section.site.last} + {if $place >= 4}<td> </td>{/if} + {if $place >= 3}<td> </td>{/if} + {if $place >= 2}<td> </td>{/if} + {if $place >= 1}<td> </td>{/if} </tr> - </table> - {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} + <tr><td colspan="5" align="center" height="25" valign="bottom">{if !$_multipage.is_last_page}{suivant} - {/if}{pagination}</td></tr> + </table> {/if} +{sectionelse} + Veuillez entrer votre recherche ci-dessous. +{/section} - {sectionelse} - Ce flux ne contient aucun \xE9l\xE9ment. - {/section} - +{if $SHOW=='rec'} +<br>Recherche<br> <br><form name="form1" method="get" action="index1.php"> +<input name="show" type="hidden" value="rec"> +<input name="string" bgcolor="{#COULEUR_TEXTBOX#}" type="text" charset="digit|alpha|caps" value="" size="20"> +</form><br> +La touche {literal}#{/literal} permet de changer entre les minuscules/majuscules et les chiffres. {/if} Modified: trunk/skin/ETI/menu.tpl =================================================================== --- trunk/skin/ETI/menu.tpl 2007-05-31 04:53:08 UTC (rev 168) +++ trunk/skin/ETI/menu.tpl 2007-06-01 04:44:56 UTC (rev 169) @@ -33,7 +33,7 @@ {if $MENU[menu].name!='Web' AND $MENU[menu].name!='Multim\xE9dia' AND $MENU[menu].name!='Pratique'} <tr><td><table border="0" cellpadding="0" cellspacing="0" href="{$MODULE}{$MENU[menu].rep}{$MENU[menu].lien}" background="{$RACINE_REP}{$SKIN_REP}images/selection/selection_2.gif" once rollover><tr> <td width="40"> - <img width="35" height="35" src="{if $MENU[menu].dependance=='Alone'}{$IMG2FBX}?cache=1&width=40&height=40&img={$RES_ICO|cat:$MENU[menu].ico|cat:".gif"|realpath|urlencode}{else}{$IMG2FBX}?cache=1&width=35&height=35&img={$SKIN_REP|cat:"images/icons/"|cat:$MENU[menu].ico|cat:".gif"|realpath|urlencode}{/if}" border="0" /> + <img width="40" height="40" src="{if $MENU[menu].dependance=='Alone'}{$IMG2FBX}?cache=1&width=40&height=40&transparence=1&img={$RES_ICO|cat:$MENU[menu].ico|cat:".gif"|realpath|urlencode}{else}{$IMG2FBX}?cache=1&width=40&height=40&transparence=1&img={$SKIN_REP|cat:"images/icons/"|cat:$MENU[menu].ico|cat:".gif"|realpath|urlencode}{/if}" border="0" /> </td> <td width="150"> <font size="2" color="{#white#}"><b>{$MENU[menu].name}</b></font> @@ -45,7 +45,7 @@ {if $MENU[menu].name=="Films"} <tr><td><table border="0" cellpadding="0" cellspacing="0" href="{$MODULE}{$MENU[menu].rep}catalogue.php" background="{$RACINE_REP}{$SKIN_REP}images/selection/selection_2.gif" once rollover><tr> <td width="40"> - <img src="{if $MENU[menu].dependance=='Alone'}{$IMG2FBX}?cache=1&width=40&height=40&img={$RES_ICO|cat:$MENU[menu].ico|cat:".gif"|realpath|urlencode}{else}{$IMG2FBX}?cache=1&width=40&height=40&img={$SKIN_REP|cat:"images/icons/"|cat:$MENU[menu].ico|cat:".gif"|realpath|urlencode}{/if}" border="0" width="40" height="40"> + <img src="{if $MENU[menu].dependance=='Alone'}{$IMG2FBX}?cache=1&width=40&height=40&transparence=1&img={$RES_ICO|cat:$MENU[menu].ico|cat:".gif"|realpath|urlencode}{else}{$IMG2FBX}?cache=1&width=40&height=40&transparence=1&img={$SKIN_REP|cat:"images/icons/"|cat:$MENU[menu].ico|cat:".gif"|realpath|urlencode}{/if}" border="0" width="40" height="40"> </td> <td width="150"> <font size="2" color="{#white#}"><b>Catalogue</b></font> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ara...@us...> - 2007-05-31 04:53:10
|
Revision: 168 http://svn.sourceforge.net/easybox-mod/?rev=168&view=rev Author: aragornis Date: 2007-05-30 21:53:08 -0700 (Wed, 30 May 2007) Log Message: ----------- Raffraichissement auto des disques uniquement sous linux. Sous windows cela prend trop de temps et retarde trop le chargemement de page ! Modified Paths: -------------- trunk/module/dvd/index1.php Modified: trunk/module/dvd/index1.php =================================================================== --- trunk/module/dvd/index1.php 2007-05-30 20:37:07 UTC (rev 167) +++ trunk/module/dvd/index1.php 2007-05-31 04:53:08 UTC (rev 168) @@ -22,7 +22,10 @@ $smarty->assign('dvdmod',true); include($EXPLORATEUR); }else{ - save_variable('disques', serialize(DISQUES())); + if(!(PHP_OS == "WIN32" || PHP_OS == "WINNT")) { + save_variable('disques', serialize(DISQUES())); + } + $DISQUES = unserialize(get_variable('disques')); $disques_dispo = array(); $disques_optique = array(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cra...@us...> - 2007-05-30 20:37:14
|
Revision: 167 http://svn.sourceforge.net/easybox-mod/?rev=167&view=rev Author: craftsnux Date: 2007-05-30 13:37:07 -0700 (Wed, 30 May 2007) Log Message: ----------- rafraichisement auto des lecteurs dans le module DVD Modified Paths: -------------- trunk/module/dvd/index1.php Modified: trunk/module/dvd/index1.php =================================================================== --- trunk/module/dvd/index1.php 2007-05-28 20:47:16 UTC (rev 166) +++ trunk/module/dvd/index1.php 2007-05-30 20:37:07 UTC (rev 167) @@ -22,6 +22,7 @@ $smarty->assign('dvdmod',true); include($EXPLORATEUR); }else{ + save_variable('disques', serialize(DISQUES())); $DISQUES = unserialize(get_variable('disques')); $disques_dispo = array(); $disques_optique = array(); 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:47:22
|
Revision: 166 http://svn.sourceforge.net/easybox-mod/?rev=166&view=rev Author: aragornis Date: 2007-05-28 13:47:16 -0700 (Mon, 28 May 2007) Log Message: ----------- - maj des deux skins optionnelles Modified Paths: -------------- trunk/skin/ETI/interface.tpl trunk/skin/mediacenter/interface.tpl trunk/skin/mediacenter/menu.tpl trunk/skin/simplegreen/couleur.conf Modified: trunk/skin/ETI/interface.tpl =================================================================== --- trunk/skin/ETI/interface.tpl 2007-05-28 20:03:19 UTC (rev 165) +++ trunk/skin/ETI/interface.tpl 2007-05-28 20:47:16 UTC (rev 166) @@ -112,15 +112,11 @@ <tr><td width="115" background="{$RACINE_REP}{$SKIN_REP}images/selection/selection_4.gif" 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} once rollover>{$MENU_ALT[menu_alt].nom}</td></tr> {if $smarty.section.menu_alt.last} <tr><td width="115" onfocus='front_panel="RETOUR";' href="{$LINK.red}" background="{$RACINE_REP}{$SKIN_REP}images/selection/selection_4.gif" once rollover> Retour</td></tr> - {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" background="{$RACINE_REP}{$SKIN_REP}images/selection/selection_4.gif" 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} once rollover>{$MENU_SUP[menu_header].name}</td></tr> - {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" onfocus='front_panel="RETOUR";' href="{$LINK.red}" background="{$RACINE_REP}{$SKIN_REP}images/selection/selection_4.gif" once rollover><img src="{$INTERFACE_REP}btn_rouge.gif" border="0"> Retour</td></tr> {else} @@ -129,8 +125,7 @@ {/if} {/section} {/section} - <tr><td height="{$compter}"><img src="blank.gif" height="{$compter}"></td></tr> - <tr><td height="39" width="115" background="{$PLAYER_REP}pagination.gif">{if $MULTI_ACTIF}{$_multipage.current_page} / {$_multipage.nb_page}{else} {/if}</td></tr> + <tr><td height="40" width="115">{if $MULTI_ACTIF}{$_multipage.current_page} / {$_multipage.nb_page}{else} {/if}</td></tr> </table> {/if} </td><td width="525"> Modified: trunk/skin/mediacenter/interface.tpl =================================================================== --- trunk/skin/mediacenter/interface.tpl 2007-05-28 20:03:19 UTC (rev 165) +++ trunk/skin/mediacenter/interface.tpl 2007-05-28 20:47:16 UTC (rev 166) @@ -15,21 +15,16 @@ </tr> <tr> <td width="130" height="415" valign="top"> -{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> - {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} @@ -38,8 +33,7 @@ {/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> + <tr><td height="39" width="115">{if $MULTI_ACTIF}{$_multipage.current_page} / {$_multipage.nb_page}{else} {/if}</td></tr> </table> Modified: trunk/skin/mediacenter/menu.tpl =================================================================== --- trunk/skin/mediacenter/menu.tpl 2007-05-28 20:03:19 UTC (rev 165) +++ trunk/skin/mediacenter/menu.tpl 2007-05-28 20:47:16 UTC (rev 166) @@ -8,19 +8,19 @@ {section name=menu loop=$MENU} {if $CAT=="1" AND NOT $SHOW} {if $smarty.section.menu.first} - <a focused onfocus='front_panel="FILMS";service="ts://127.0.0.1?ox=0&oy=0&ow=720&oh=576,&ix=0&iy=0&iw=360&ih=192";location="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 focused onfocus='front_panel="FILMS";service="srv://default?ox=0&oy=0&ow=720&oh=576,&ix=0&iy=0&iw=360&ih=192";' href="../../module/films/index1.php"> </a> - <a onfocus='front_panel="MODULES";service="ts://127.0.0.1?ox=0&oy=0&ow=720&oh=576,&ix=0&iy=384&iw=360&ih=192";location="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 onfocus='front_panel="MODULES";service="srv://default?ox=0&oy=0&ow=720&oh=576,&ix=0&iy=384&iw=360&ih=192";' href="../../module/_menu/menu.php?show=1"> </a> - <a onfocus='front_panel="PHOTO";service="ts://127.0.0.1?ox=0&oy=0&ow=720&oh=576,&ix=360&iy=192&iw=360&ih=192";location="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 onfocus='front_panel="PHOTO";service="srv://default?ox=0&oy=0&ow=720&oh=576,&ix=360&iy=192&iw=360&ih=192";' href="../../module/diaporama/index1.php"> </a> - <a onfocus='front_panel="AUDIO";service="ts://127.0.0.1?ox=0&oy=0&ow=720&oh=576,&ix=0&iy=192&iw=360&ih=192";location="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 onfocus='front_panel="AUDIO";service="srv://default?ox=0&oy=0&ow=720&oh=576,&ix=0&iy=192&iw=360&ih=192";' href="../../module/mp3/lecteuraudio.php"> </a> - <a onfocus='front_panel="BIBLIOTHEQUE";service="ts://127.0.0.1?ox=0&oy=0&ow=720&oh=576,&ix=360&iy=0&iw=360&ih=192";location="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 onfocus='front_panel="BIBLIOTHEQUE";service="srv://default?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/simplegreen/couleur.conf =================================================================== --- trunk/skin/simplegreen/couleur.conf 2007-05-28 20:03:19 UTC (rev 165) +++ trunk/skin/simplegreen/couleur.conf 2007-05-28 20:47:16 UTC (rev 166) @@ -67,7 +67,7 @@ COULEUR_FOND_AVERTISSEMENT = "#B7D88B3F" #///////////////////////////////// Fond d'\xE9cran /////////////////////////////////// -BACKGROUND = "background.jpg" +BACKGROUND = "background.png" TYPE = "int" ?> 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-05-28 19:48:33
|
Revision: 164 http://svn.sourceforge.net/easybox-mod/?rev=164&view=rev Author: aragornis Date: 2007-05-28 12:48:30 -0700 (Mon, 28 May 2007) Log Message: ----------- - skin ETI (pour d?\195?\169group?\195?\169s seulement) - r?\195?\169paration de qq bugs Modified Paths: -------------- trunk/_framework/fonctions_partagees.inc.php trunk/_framework/lib/lib_photo.php trunk/skin/mediacenter/films.tpl trunk/skin/mediacenter/menu.tpl Added Paths: ----------- trunk/skin/ETI/ trunk/skin/ETI/audio.tpl trunk/skin/ETI/avertissement.tpl trunk/skin/ETI/bouton.tpl Removed Paths: ------------- trunk/module/telesite/ Modified: trunk/_framework/fonctions_partagees.inc.php =================================================================== --- trunk/_framework/fonctions_partagees.inc.php 2007-05-26 09:43:53 UTC (rev 163) +++ trunk/_framework/fonctions_partagees.inc.php 2007-05-28 19:48:30 UTC (rev 164) @@ -262,7 +262,7 @@ function DISQUES(){ $lect=array(); if (PHP_OS == "WIN32" || PHP_OS == "WINNT") { - $obj = new COM ( 'Scripting.FileSystemObject' ); + $obj = @new COM ( 'Scripting.FileSystemObject' ); if ( is_object ( $obj ) ) { @@ -299,21 +299,21 @@ { $lect[] = array('lettre'=>$io->DriveLetter, 'path'=>$io->DriveLetter.':\\', 'type'=>$type, 'nom'=>$io->VolumeName, 'gif'=>$gifFile); } -// BDE - 18/10/2006 - Modification dans la gestion des disques -// Le code suivant est \xE0 d\xE9commenter pour afficher les disques HS -/* - else - { - $gifFile = $gifFile.'KO'; - $lect[] = array('lettre'=>$io->DriveLetter, 'path'=>$io->DriveLetter.':\\', 'type'=>$type, 'nom'=>'Non accessible', 'gif'=>$gifFile); - } -*/ } // On ajoute le bouton de rafraichissement $lect[] = array('lettre'=>'Rafra\xEEchir', 'path'=>'reload', 'type'=>'fonction', 'nom'=>'Recharger', 'gif'=>'reload'); $obj = null; + }else{ + + // Au cas o\xF9 le composant DOM ne marcherait pas + $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"); + foreach($lecteur as $l){ + if(realpath($l.':/')!=''){ + $lect[]=array('lettre'=>$l, 'path'=>$l.':\\', 'type'=>'Disque dur', 'nom'=>$l.':', 'gif'=>'diskhdd'); + } + } } } elseif (is_readable('/etc/mtab')) { // si ce fichier est lisible on assume qu'on est sur un OS qui le supporte Modified: trunk/_framework/lib/lib_photo.php =================================================================== --- trunk/_framework/lib/lib_photo.php 2007-05-26 09:43:53 UTC (rev 163) +++ trunk/_framework/lib/lib_photo.php 2007-05-28 19:48:30 UTC (rev 164) @@ -127,6 +127,12 @@ $this->width = imagesx($this->img); $this->height = imagesy($this->img); + + $trans = imagecolortransparent($this->img); + if($trans!=-1){ + $trans = imagecolorsforindex($this->img,imagecolortransparent($this->img)); + } + // Tourner $this->tourner(); @@ -135,6 +141,10 @@ $this->redimensionner(); } + if($trans!=-1){ + imagecolortransparent($this->img,imagecolorallocate($this->img, $trans['red'], $trans['green'], $trans['blue'])); + } + // Mettre en cache if($this->cache){ @@ -171,7 +181,11 @@ $redimx = floor($this->width*$pourcent); $redimy = floor($this->height*$pourcent); $image1 = imagecreatetruecolor($redimx, $redimy); - + imagesavealpha($image1, true); + $trans_colour = imagecolorallocatealpha($image1, 0, 0, 0, 127); + imagefill($image1, 0, 0, $trans_colour); + imagealphablending($image1, false); + if($this->quality=='max'){ ImageCopyresampled($image1,$this->img,0,0,0,0,$redimx,$redimy,$this->width,$this->height); }else{ Added: trunk/skin/ETI/audio.tpl =================================================================== --- trunk/skin/ETI/audio.tpl (rev 0) +++ trunk/skin/ETI/audio.tpl 2007-05-28 19:48:30 UTC (rev 164) @@ -0,0 +1,168 @@ +{php} +global $MENU_ALT, $VLC, $smarty, $mode; +($VLC['etat']!='playing'?$text='Jouer':$text='Pause'); + +$MENU_ALT[] = array('lien'=>'lecteuraudio.php?control=pause', 'nom'=>$text, 'selected'=>0); +$MENU_ALT[] = array('lien'=>'lecteuraudio.php?control=stop', 'nom'=>'Arr\xEAter', 'selected'=>0); +$MENU_ALT[] = array('lien'=>'lecteuraudio.php?control=previous', 'nom'=>'Piste pr\xE9c\xE9dente', 'selected'=>0); +$MENU_ALT[] = array('lien'=>'lecteuraudio.php?control=next', 'nom'=>'Piste suivante', 'selected'=>0); + +$MENU_ALT[] = array('lien'=>'lecteuraudio.php?mode=pla', 'nom'=>'Playlist', 'selected'=>$mode=='pla'); +$MENU_ALT[] = array('lien'=>'lecteuraudio.php?mode=bib', 'nom'=>'Biblioth\xE8que', 'selected'=>$mode=='bib'); +$MENU_ALT[] = array('lien'=>'lecteuraudio.php?mode=exp', 'nom'=>'Explorateur', 'selected'=>$mode=='exp'); +$MENU_ALT[] = array('lien'=>'lecteuraudio.php?mode=par', 'nom'=>'Paroles', 'selected'=>$mode=='par'); +$MENU_ALT[] = array('lien'=>'lecteuraudio.php?mode=pod', 'nom'=>'Podcast', 'selected'=>$mode=='pod'); +$MENU_ALT[] = array('lien'=>'lecteuraudio.php?mode=web', 'nom'=>'Web-Radios', 'selected'=>$mode=='web'); + + +/* +href="lecteuraudio.php?action=nextrandom"><font size=1 color="{if $statut.random}{#COULEUR_BOUTON_SELECTED#}{else}{#COULEUR_DEFAUT#}{/if}">Al\xE9atoire</font></a></td> +href="lecteuraudio.php?action=nextboucle"><font size=1 color="{if $statut.repeat or $statut.loop}{#COULEUR_BOUTON_SELECTED#}{else}{#COULEUR_DEFAUT#}{/if}">{$boucle_valeur}</font></a></td> +*/ + $smarty->assign('TITRE','Lecteur audio'); + $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> +<head> +{include file="bouton.tpl"} +{setbackground path="none"} +</head> +<body background="ts://127.0.0.1" text="{#COULEUR_LECTEUR_TEXT#}" link="{#COULEUR_LECTEUR_LINK#}" alink="{#COULEUR_LECTEUR_ALINK#}" vlink="{#COULEUR_LECTEUR_VLINK#}"> +<center> +<table width="645" height="494" border="0" align="center" cellpadding="0" cellspacing="0"> + <tr><td width="10" height="1"><img src="transparent.gif" width="1" height="1"></td><td width="625" height="1"><img src="transparent.gif" width="1" height="1"></td><td width="10" height="1"><img src="transparent.gif" width="1" height="1"></td></tr> + <tr><td width="5" height="493"><img src="transparent.gif" width="1" height="1"></td> + <td width="625" height="493"> + <table width="625" height="493" border="0" align="center" cellpadding="0" cellspacing="0"> + <tr><td bgcolor="{#COULEUR_FOND2#}" width="295" height="73" align=center> + + <!-- D\xE9but du panneau de commandes --> + <table border="0" cellpadding="0" cellspacing="0" width="295" height="73" background="player.gif"> + <tr> + <td width="19" height="73"><img src="transparent.gif" width="1" height="1"></td> + <td width="19" height="73"><table align="left" border="0" cellpadding="0" cellspacing="0" width="19" height="73"> + <tr> + <td width="19" height="36"><img src="transparent.gif" width="1" height="1"></td> + </tr> + <tr> + <td width="19" height="21" align=center valign=middle><a href="lecteuraudio.php?control=pause"><font color="{if $VLC.etat!='playing'}{#COULEUR_BOUTON_SELECTED#}{else}{#COULEUR_DEFAUT#}{/if}" family="Symbol">{if $VLC.etat=='stop'}T{else}Y{/if}</font></a></td> + </tr> + <tr> + <td width="19" height="16"><img src="transparent.gif" width="1" height="1"></td> + </tr> + </table></td> + <td width="29" height="73"><img src="transparent.gif" width="1" height="1"></td> + <td height="73" width="14"><table align="left" border="0" cellpadding="0" cellspacing="0" width="14" height="73"> + <tr> + <td width="14" height="39"><img src="transparent.gif" width="1" height="1"></td> + </tr> + <tr> + <td width="14" height="14" align=center valign=middle><a href="lecteuraudio.php?control=stop"><font color="{if $VLC.etat!='stop'}{#COULEUR_DEFAUT#}{else}{#COULEUR_BOUTON_SELECTED#}{/if}" family="Symbol">Z</font></a></td> + </tr> + <tr> + <td width="14" height="20"><img src="transparent.gif" width="1" height="1"></td> + </tr> + </table></td> + <td width="18" height="73"><img src="transparent.gif" width="1" height="1"></td> + <td width="14" height="73"><table align="left" border="0" cellpadding="0" cellspacing="0" width="14" height="73"> + <tr> + <td width="14" height="34"><img src="transparent.gif" width="1" height="1"></td> + </tr> + <tr> + <td width="14" height="14" align=center valign=middle><a href="lecteuraudio.php?control=previous"><font color="{#COULEUR_DEFAUT#}" family="Symbol">@@</font></a></td> + </tr> + <tr> + <td width="14" height="25"><img src="transparent.gif" width="1" height="1"></td></tr></table></td> + <!-- + + --> + <td width="11" height="73"><img src="transparent.gif" width="1" height="1"></td> + <td width="14" height="73"><table align="left" border="0" cellpadding="0" cellspacing="0" width="14" height="73"> + <tr> + <td width="14" height="34"><img src="transparent.gif" width="1" height="1"></td> + </tr> + <tr> + <td width="14" height="14" align=center valign=middle><a href="lecteuraudio.php?control=next"><font color="{#COULEUR_DEFAUT#}" family="Symbol">AA</font></a></td> + </tr> + <tr> + <td width="14" height="25"><img src="transparent.gif" width="1" height="1"></td> + </tr> + </table></td> + <td width="49" height="73"><img src="transparent.gif" width="1" height="1"></td> + <td width="90" height="73"><table align="left" border="0" cellpadding="0" cellspacing="0" width="90" height="73"> + <tr> + <td width="90" height="20"><img src="transparent.gif" width="1" height="1"></td> + </tr> + <tr> + <td width="90" height="12" align=center valign=middle><a href="lecteuraudio.php?action=nextrandom"><font size=1 color="{if $statut.random}{#COULEUR_BOUTON_SELECTED#}{else}{#COULEUR_DEFAUT#}{/if}">Al\xE9atoire</font></a></td> + </tr> + <tr> + <td width="90" height="5"><img src="transparent.gif" width="1" height="1"></td> + </tr> + <tr> + <td width="90" height="10" align=center valign=middle><a href="lecteuraudio.php?action=nextboucle"><font size=1 color="{if $statut.repeat or $statut.loop}{#COULEUR_BOUTON_SELECTED#}{else}{#COULEUR_DEFAUT#}{/if}">{$boucle_valeur}</font></a></td> + </tr> + <tr> + <td width="90" height="18"><img src="transparent.gif" width="1" height="1"></td> + </tr> + </table></td> + <td width="18" height="73"><img src="transparent.gif" width="1" height="1"></td> + </tr> + </table> + <!-- Fin du panneau de commandes --> + + </td><td width="330" height="73" bgcolor="{#COULEUR_FOND2#}"> + + <table border="0" cellpadding="0" cellspacing="0" width="330" height="73"><tr> + + {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}"> + </td> + {/if} + + <td width="260" height="73"> + + {section name=infos loop=$informations max=5} + <font size="1">{$informations[infos].0|capitalize|ucfirst} : {$informations[infos].1|truncate:45:''}</font><br> + {sectionelse} + Aucune information disponible + {/section} + + </td></tr></table> + + </td> + </td></tr> + <tr bgcolor="#00000000"><td colspan="2" width="625" height="3"><img src="transparent.gif" width="1" height="1"></td></tr> + <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> + </tr> + </table> + </td></tr> + <tr bgcolor="#00000000"><td colspan="2" width="625" height="3"><img src="transparent.gif" width="1" height="1"></td></tr> + <tr><td bgcolor="{#COULEUR_FOND2#}" colspan="2" width="625" height="389" align="center" valign="top"> + + {eval var=$CONTENT} + + <var name=aide width=450> + + </td></tr> + </table> + </td><td width="5" height="493"></td></tr> +</table> +</center> +<script language="javascript" src="/fb2ie.js"> +</script> +</body> +</html>*} Added: trunk/skin/ETI/avertissement.tpl =================================================================== --- trunk/skin/ETI/avertissement.tpl (rev 0) +++ trunk/skin/ETI/avertissement.tpl 2007-05-28 19:48:30 UTC (rev 164) @@ -0,0 +1,23 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> +<html> +<head> +{include file="bouton.tpl"} +</head> +<body background="ts://127.0.0.1" text="{#COULEUR_TEXT#}" link="{#COULEUR_LINK#}" alink="{#COULEUR_ALINK#}" vlink="{#COULEUR_VLINK#}"> +<center><table width="590" height="510" border="0" align="center" cellpadding="0" cellspacing="0"><tr><td align=center width="590" height="510" valign="middle"> + <table width="540" border="2" cellpadding="10" cellspacing="0" bgcolor="{#COULEUR_FOND_AVERTISSEMENT#}" bordercolor="#54585A3F"><tr><td width="590"> + <table width="540" border="0" cellpadding="10" cellspacing="0"><tr> + {if NOT $no_icone}<td align="center" width="80" height="80"> + <img src="{$INTERFACE_REP}info.gif" border="0" width="80" height="80"> + </td>{/if}<td align="center" valign="middle" width="460"> + {if $TITRE!=''}<font size=4>{$TITRE}</font><br> <br> <br>{/if} + {eval var=$AVERTISSEMENT} + </td> + </tr></table> + </td></tr></table> +</td></tr></table></center> + +<script language="javascript" src="/fb2ie.js"> +</script> +</body> +</html> Added: trunk/skin/ETI/bouton.tpl =================================================================== --- trunk/skin/ETI/bouton.tpl (rev 0) +++ trunk/skin/ETI/bouton.tpl 2007-05-28 19:48:30 UTC (rev 164) @@ -0,0 +1,10 @@ +<!BOUTONS!> +{foreach from=$META item=META_FE key=key} + <meta name="{$key}" content="{$META_FE}"> + +{/foreach} +{foreach from=$LINK item=META_FE key=key} + <link rel="{$key}" href="{$META_FE}"> +{/foreach} + +<!BOUTONS!> Modified: trunk/skin/mediacenter/films.tpl =================================================================== --- trunk/skin/mediacenter/films.tpl 2007-05-26 09:43:53 UTC (rev 163) +++ trunk/skin/mediacenter/films.tpl 2007-05-28 19:48:30 UTC (rev 164) @@ -49,18 +49,34 @@ Augmenter la qualit\xE9 du traitement de l'image (de 0 vers 6) demande plus de puissance CPU. <br> -<select name=display_scaling> -<option value=letterbox>Letterbox -<option value=panscan>Pan Scan -<option value=fullscreen>Fullscreen -</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> </table> + +{if $vers_fbx==5} +<select name=display_scaling> +<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"> +<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/skin/mediacenter/menu.tpl =================================================================== --- trunk/skin/mediacenter/menu.tpl 2007-05-26 09:43:53 UTC (rev 163) +++ trunk/skin/mediacenter/menu.tpl 2007-05-28 19:48:30 UTC (rev 164) @@ -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";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 focused onfocus='front_panel="FILMS";service="ts://127.0.0.1?ox=0&oy=0&ow=720&oh=576,&ix=0&iy=0&iw=360&ih=192";location="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";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 onfocus='front_panel="MODULES";service="ts://127.0.0.1?ox=0&oy=0&ow=720&oh=576,&ix=0&iy=384&iw=360&ih=192";location="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";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 onfocus='front_panel="PHOTO";service="ts://127.0.0.1?ox=0&oy=0&ow=720&oh=576,&ix=360&iy=192&iw=360&ih=192";location="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";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 onfocus='front_panel="AUDIO";service="ts://127.0.0.1?ox=0&oy=0&ow=720&oh=576,&ix=0&iy=192&iw=360&ih=192";location="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";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 onfocus='front_panel="BIBLIOTHEQUE";service="ts://127.0.0.1?ox=0&oy=0&ow=720&oh=576,&ix=360&iy=0&iw=360&ih=192";location="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} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gu...@us...> - 2007-05-26 09:43:55
|
Revision: 163 http://svn.sourceforge.net/easybox-mod/?rev=163&view=rev Author: guyou Date: 2007-05-26 02:43:53 -0700 (Sat, 26 May 2007) Log Message: ----------- Gel de la version v4.1.1 Added Paths: ----------- tags/4.1.1/ Copied: tags/4.1.1 (from rev 158, trunk) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gu...@us...> - 2007-05-26 09:43:12
|
Revision: 162 http://svn.sourceforge.net/easybox-mod/?rev=162&view=rev Author: guyou Date: 2007-05-26 02:43:06 -0700 (Sat, 26 May 2007) Log Message: ----------- Gel de la version v4.1.0 Added Paths: ----------- tags/4.1.0/ Copied: tags/4.1.0 (from rev 157, trunk) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ara...@us...> - 2007-05-25 19:13:53
|
Revision: 161 http://svn.sourceforge.net/easybox-mod/?rev=161&view=rev Author: aragornis Date: 2007-05-25 12:13:50 -0700 (Fri, 25 May 2007) Log Message: ----------- R?\195?\169solution probl?\195?\168me de dates incoh?\195?\169rentes sur le module guidetv Modified Paths: -------------- trunk/_framework/demarrage.php trunk/module/guidetv/tvprogram.php Modified: trunk/_framework/demarrage.php =================================================================== --- trunk/_framework/demarrage.php 2007-05-23 21:05:15 UTC (rev 160) +++ trunk/_framework/demarrage.php 2007-05-25 19:13:50 UTC (rev 161) @@ -90,7 +90,9 @@ } //Suppression des trop gros fichiers du cache - $files = glob($CACHE_IMAGE.'*'); + $files = glob($CACHE_IMAGE.'*.png'); + $files2 = glob($CACHE_IMAGE.'*.gif'); + $files = array_merge($files, $files2); foreach ($files as $filename) { if(filesize($filename)>=75000 OR (filemtime($filename)+864000)<=time()){ @unlink($filename); Modified: trunk/module/guidetv/tvprogram.php =================================================================== --- trunk/module/guidetv/tvprogram.php 2007-05-23 21:05:15 UTC (rev 160) +++ trunk/module/guidetv/tvprogram.php 2007-05-25 19:13:50 UTC (rev 161) @@ -1,7 +1,7 @@ <?php $RACINE_REP = "../../"; require($RACINE_REP.'_framework/framework.php'); -setlocale(LC_TIME, 'french'); +setlocale(LC_TIME, 'fr_FR'); (isset($_GET['min']))?$min=$_GET['min']:$min=0; (isset($_GET['jour'])&&$_GET['jour'])?$jour=$_GET['jour']:$jour=2; @@ -133,7 +133,7 @@ if(isset($_GET['emission'])){ $LINK['red'] = 'tvprogram.php?jour='.$jour.'&chaine='.$chaine['id'].'&min='.$min; - $smarty->assign('TITRE','Programme t\xE9l\xE9 - '.$chaine['nom'].' - '.strftime("%A",mktime(0,0,0,date('m'),date('d')+($jour-1),date('Y'))).' '.date("d",mktime(0,0,0,date('m'),date('d')+($jour-1),date('Y')))); + $smarty->assign('TITRE','Programme t\xE9l\xE9 - '.$chaine['nom'].' - '.strftime("%A",mktime(0,0,0,date('m'),date('d')+($jour-2),date('Y'))).' '.date("d",mktime(0,0,0,date('m'),date('d')+($jour-2),date('Y')))); $smarty->assign('EMISSION',infos_emissions($_GET['emission'],$_GET['debut'],$_GET['fin'])); $smarty->assign('CONTENT',$smarty->fetch('guidetv.tpl')); @@ -141,7 +141,7 @@ $LINK['red'] = 'tvprogram.php'; $info_chaine = '&chaine='.$chaine['id']; - $smarty->assign('TITRE','Programme t\xE9l\xE9 - '.$chaine['nom'].' - '.strftime("%A",mktime(0,0,0,date('m'),date('d')+($jour-1),date('Y'))).' '.date("d",mktime(0,0,0,date('m'),date('d')+($jour-1),date('Y')))); + $smarty->assign('TITRE','Programme t\xE9l\xE9 - '.$chaine['nom'].' - '.strftime("%A",mktime(0,0,0,date('m'),date('d')+($jour-2),date('Y'))).' '.date("d",mktime(0,0,0,date('m'),date('d')+($jour-2),date('Y')))); $smarty->assign('EMISSIONS',programme_chaine($chaine,$jour)); $smarty->assign('CONTENT',$smarty->fetch('guidetv.tpl')); @@ -154,7 +154,7 @@ $MENU_ALT[] = array('lien'=>'tvprogram.php?jour=2'.$info_chaine, 'nom'=>'Aujourd\'hui', 'selected'=>$date==2); $MENU_ALT[] = array('lien'=>'tvprogram.php?jour=3'.$info_chaine, 'nom'=>'Demain', 'selected'=>$date==3); for($i = 4; $i <= 7 ;$i++){ - $MENU_ALT[] = array('lien'=>'tvprogram.php?jour='.$i.$info_chaine, 'nom'=>ucfirst(strftime("%a",mktime(0,0,0,date('m'),date('d')+($i-2),date('Y')))).' '.date("d",mktime(0,0,0,date('m'),date('d')+($i-1),date('Y'))), 'selected'=>$date==$i); + $MENU_ALT[] = array('lien'=>'tvprogram.php?jour='.$i.$info_chaine, 'nom'=>ucfirst(strftime("%a",mktime(0,0,0,date('m'),date('d')+($i-2),date('Y')))).' '.date("d",mktime(0,0,0,date('m'),date('d')+($i-2),date('Y'))), 'selected'=>$date==$i); } $smarty->display('interface.tpl'); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ara...@us...> - 2007-05-23 21:05:17
|
Revision: 160 http://svn.sourceforge.net/easybox-mod/?rev=160&view=rev Author: aragornis Date: 2007-05-23 14:05:15 -0700 (Wed, 23 May 2007) Log Message: ----------- - compatibilit?\195?\169 avec les v3/v4 non d?\195?\169group?\195?\169s (les images du net r?\195?\169apparaissent ^^) -> v4.1.2 Modified Paths: -------------- trunk/_framework/framework.php trunk/_framework/lib/lib_photo.php trunk/_utilisateur/modules.db trunk/version.html Modified: trunk/_framework/framework.php =================================================================== --- trunk/_framework/framework.php 2007-05-23 15:01:43 UTC (rev 159) +++ trunk/_framework/framework.php 2007-05-23 21:05:15 UTC (rev 160) @@ -9,8 +9,12 @@ $vers_fbx = $_SERVER["HTTP_USER_AGENT"]; $ereg = 'freebox\/[0-9]\.[0-9]\.[0-9] \(hw:([0-9]).0;'; - preg_match("/$ereg/s", $vers_fbx, $val_vers); - $vers_fbx = $val_vers[1]; + if(preg_match("/$ereg/s", $vers_fbx, $val_vers)){ + $vers_fbx = $val_vers[1]; + }else{ + $vers_fbx = 4; + } + unset($val_vers); //-- Chargement du r\xE9pertoire du framework Modified: trunk/_framework/lib/lib_photo.php =================================================================== --- trunk/_framework/lib/lib_photo.php 2007-05-23 15:01:43 UTC (rev 159) +++ trunk/_framework/lib/lib_photo.php 2007-05-23 21:05:15 UTC (rev 160) @@ -66,7 +66,7 @@ if(preg_match("/$ereg/s", $vers_fbx, $val_vers)){ $this->fbx = $val_vers[1]; }else{ - $this->fbx = 5; + $this->fbx = 4; } // Change le format d'exportation selon la version de la freebox Modified: trunk/_utilisateur/modules.db =================================================================== (Binary files differ) Modified: trunk/version.html =================================================================== --- trunk/version.html 2007-05-23 15:01:43 UTC (rev 159) +++ trunk/version.html 2007-05-23 21:05:15 UTC (rev 160) @@ -4,6 +4,6 @@ </head> <body> <h1>Easybox</h1> -<h2>4.1.1</h2> +<h2>4.1.2</h2> </body> </html> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ara...@us...> - 2007-05-23 15:01:51
|
Revision: 159 http://svn.sourceforge.net/easybox-mod/?rev=159&view=rev Author: aragornis Date: 2007-05-23 08:01:43 -0700 (Wed, 23 May 2007) Log Message: ----------- - mise en place d'un cache pour les pages t?\195?\169l?\195?\169charg?\195?\169es sur internet Modified Paths: -------------- trunk/_framework/fonctions_partagees.inc.php trunk/configuration/bases.xml trunk/module/cinefil/index1.php trunk/module/clips/index1.php trunk/module/dailymotion/index1.php trunk/module/ephemeride/index1.php trunk/module/guidetv/tvprogram.php trunk/module/mp3/paroles.php trunk/module/mp3/podcast.php trunk/module/recettes/index1.php trunk/module/recettes/recettes.php trunk/module/seances/programme_cine.tpl trunk/module/seances/voirsalle.php trunk/module/stage6/index1.php trunk/module/youtube/index1.php Removed Paths: ------------- trunk/_framework/img2fbx.php trunk/_framework/lib/img_cr.php trunk/module/films/playba.php Modified: trunk/_framework/fonctions_partagees.inc.php =================================================================== --- trunk/_framework/fonctions_partagees.inc.php 2007-05-22 21:38:57 UTC (rev 158) +++ trunk/_framework/fonctions_partagees.inc.php 2007-05-23 15:01:43 UTC (rev 159) @@ -854,4 +854,41 @@ $smarty->assign('VLC',$VLC); } + +// T\xE9l\xE9charge une page internet et la met en cache ou r\xE9cup\xE8re directement son contenu mis en cache +function file_get_contents_cache($adresse, $heures=1){ +global $USER, $CACHE_IMAGE; + $db = sqlite_open($USER.'cache.db', 0666); + $fichier = md5($adresse); + clean_cache(); + $res = sqlite_query($db,'SELECT * FROM cache WHERE fichier="'.$fichier.'"'); + if(sqlite_num_rows($res)>0 AND file_exists($CACHE_IMAGE.$fichier)){ + $retour = file_get_contents($CACHE_IMAGE.$fichier); + }else{ + $retour = file_get_contents($adresse); + file_put_contents($CACHE_IMAGE.$fichier, $retour); + sqlite_query($db,'INSERT INTO cache VALUES(NULL,\''.sqlite_escape_string($fichier).'\', \''.(time()+($heures*3600)).'\')'); + } + sqlite_close($db); + return $retour; +} + +// Ouvre un fichier xml en le mettant en cache +function simplexml_load_file_cache($adresse, $heures){ + return simplexml_load_string(file_get_contents_cache($adresse, $heures)); +} + +// Nettoie les fichiers p\xE9rim\xE9s du cache +function clean_cache(){ +global $USER, $CACHE_IMAGE; + $db = sqlite_open($USER.'cache.db', 0666); + $temps = time(); + $res = sqlite_query($db,'SELECT * FROM cache WHERE expire<"'.$temps.'"'); + $retour = sqlite_fetch_all($res); + foreach($retour as $r){ + unlink($CACHE_IMAGE.$r['fichier']); + } + sqlite_query($db,'DELETE FROM cache WHERE expire<"'.$temps.'"'); + sqlite_close($db); +} ?> Deleted: trunk/_framework/img2fbx.php =================================================================== --- trunk/_framework/img2fbx.php 2007-05-22 21:38:57 UTC (rev 158) +++ trunk/_framework/img2fbx.php 2007-05-23 15:01:43 UTC (rev 159) @@ -1,79 +0,0 @@ -<?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(); - } - } -} -?> Deleted: trunk/_framework/lib/img_cr.php =================================================================== --- trunk/_framework/lib/img_cr.php 2007-05-22 21:38:57 UTC (rev 158) +++ trunk/_framework/lib/img_cr.php 2007-05-23 15:01:43 UTC (rev 159) @@ -1,186 +0,0 @@ -<?php - -$RACINE_REP = realpath("../../"); -$CACHE_IMAGE = $RACINE_REP."/_utilisateur/cache/"; - -if (isset($_GET['img'])){ - if ($_GET['local']){ - $img = urldecode($_GET['img']); - }else{ - $img ='../'.urldecode($_GET['img']); - } -}else exit; -if (isset($_GET['h'])) - $h = $_GET['h']; -else -$h="70"; - -$format=$_GET['format']; - -if (isset($_GET['w'])) -$w = $_GET['w']; -else -$w="93"; - - -/*$img = str_replace("\\", "/",$img); -$img = ereg_replace("//", "/",$img); -$img = str_replace("[", "*",$img); -$img = str_replace("]", "*",$img);*/ -define("IMAGE_FLIP_HORIZONTAL", 1); -define("IMAGE_FLIP_VERTICAL", 2); -define("IMAGE_FLIP_BOTH", 3); - -function imageajuste(&$image1,$image2,$largeur,$hauteur,$position,$quality){ -global $format; - $pourcent=min (min(($largeur/imagesx($image2)),1),min(($hauteur/imagesy($image2)),1)); - $redimx=floor(imagesx($image2)*$pourcent); - $redimy=floor(imagesy($image2)*$pourcent); - $image1 = imagecreatetruecolor($redimx, $redimy); - -if($quality=="max"){ -ImageCopyresampled($image1,$image2,$px,$py,0,0,round($redimx),round($redimy),imagesx($image2),imagesy($image2)); -}else{ -imagecopyresized($image1,$image2,$px,$py, 0, 0, round($redimx),round($redimy), imagesx($image2),imagesy($image2)); -} -} - -function ImageFlip($imgsrc, $type) -{ - $width = imagesx($imgsrc); - $height = imagesy($imgsrc); - - $imgdest = imagecreatetruecolor($width, $height); - ImageAlphaBlending($imgdest, false); - - switch( $type ) - { - // mirror wzgl. osi - 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 ) -{ - // ensuring we got really RightAngle (if not we choose the closest one) - $angle = min( ( (int)(($angle+45) / 90) * 90), 270 ); - - // no need to fight - if( $angle == 0 ) - return( $imgSrc ); - - // dimenstion of source image - $srcX = imagesx( $imgSrc ); - $srcY = imagesy( $imgSrc ); - - 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 = 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 ); -} - -function is_cached($url){ -global $CACHE_IMAGE; - if(file_exists($CACHE_IMAGE.md5($url).'.gif')){ - RETURN True; - }else{ - RETURN False; - } -} - -if(isset($_GET['formatw']) && isset($_GET['formath'])){ -$h = $_GET['formath']; -$w = $_GET['formatw']; -}elseif ($format == "1") { - $h = "68";$w="88"; -}elseif($format == "2"){ - $h = "460";$w="620"; -}elseif($format == "0"){ - $h = "515";$w="660"; -} - -if(is_cached($img.$h.$w.$_GET['tourne'])){ - -$img_cr = imagecreatefromgif($CACHE_IMAGE.md5($img.$h.$w.$_GET['tourne']).'.gif'); - -}else{ - -$ext = strtolower(substr($img,strrpos($img,'.'))); -switch($ext){ - case ".jpg": - $origin = imagecreatefromjpeg($img); - break; - case ".gif": - $origin = imagecreatefromgif($img); - break; - case ".png": - $origin = imagecreatefrompng($img); - break; - } - -if ($_GET['tourne']) { - // Rotation - $ang=$_GET['tourne']; - if (abs($ang)>=360) - $ang=fmod($ang,360); - if ($ang<0) - $ang=360+$ang; - $origin = ImageRotateRightAngle($origin,$ang); -} - -imageajuste($img_cr, $origin, $w, $h, 5, $_GET['quality']); -imagegif($img_cr,$CACHE_IMAGE.md5($img.$h.$w.$_GET['tourne']).'.gif'); -} - -// on retourne l'image -header("Content-Type: image/gif"); -imagegif($img_cr); - -// destruction des images de la memoire -imagedestroy($img_cr); -imagedestroy($origin); - -?> Modified: trunk/configuration/bases.xml =================================================================== --- trunk/configuration/bases.xml 2007-05-22 21:38:57 UTC (rev 158) +++ trunk/configuration/bases.xml 2007-05-23 15:01:43 UTC (rev 159) @@ -94,6 +94,10 @@ <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> Modified: trunk/module/cinefil/index1.php =================================================================== --- trunk/module/cinefil/index1.php 2007-05-22 21:38:57 UTC (rev 158) +++ trunk/module/cinefil/index1.php 2007-05-23 15:01:43 UTC (rev 159) @@ -18,13 +18,8 @@ $titre = 'Sorties cin\xE9ma de la semaine du mercredi '.$semaine; $serverDefaultPage='http://www.allocine.fr/film/cettesemaine_gen_page='.$week.'.html'; -$page = @fopen ($serverDefaultPage, 'r') ; +$contenu_html = file_get_contents_cache($serverDefaultPage,2); -$contenu_html = ''; -while (!feof ($page)) { - $contenu_html .= trim(fgets($page, 4096)); -} - $ereg = 'width="120" valign="top"><a class="link1" href="fichefilm_gen_cfilm=(.{1,15}).html"><img src="(.{1,200})" border="0" (.{1,350})<table cellpadding="0" cellspacing="0" border="0"><tr><td style="padding: 0 0 0 0"><h2><a class="link1" href="\/film\/fichefilm_gen_cfilm=(.{1,15}).html">(.{1,100})<\/a><\/h2>(.{1,200})<td style="padding: 5 0 0 0;"><h5>(.{0,70})<\/h5><\/td><\/tr>'; preg_match_all("/$ereg/s", $contenu_html, $valeur); Modified: trunk/module/clips/index1.php =================================================================== --- trunk/module/clips/index1.php 2007-05-22 21:38:57 UTC (rev 158) +++ trunk/module/clips/index1.php 2007-05-23 15:01:43 UTC (rev 159) @@ -15,7 +15,7 @@ $smarty->assign('TITRE','Clips - '.$title[$show]); function get_videos_id($page){ - $contenu = str_replace("\r\n",'',@file_get_contents($page)); + $contenu = str_replace("\r\n",'',@file_get_contents_cache($page,5)); $ereg = '<table cellpadding="0"><tr><td class="listitem"><a href="http:\/\/fr.music.yahoo.com\/ar-(.{1,50})" title="(.{1,50})">(.{1,50})<\/a><\/td><\/tr><\/table><\/td><td bgcolor="(.{1,90})<td><table cellpadding="0" width="100%"><tr><td class="listheader"><a href="javascript:playLAUNCHVideo\((.{1,10})\)" class="listheader" title="(.{1,70})">(.{1,70})<\/a><\/td>(.{1,1500})photo=(.{1,150})&url'; preg_match_all("/$ereg/s", $contenu, $valeur); foreach($valeur[2] as $key=>$val){ @@ -27,7 +27,7 @@ } function get_recherche($rec){ - $contenu = str_replace("\r\n",'',@file_get_contents('http://search.fr.music.yahoo.com/search/?p='.urlencode($rec).'&m=video')); + $contenu = str_replace("\r\n",'',@file_get_contents_cache('http://search.fr.music.yahoo.com/search/?p='.urlencode($rec).'&m=video',5)); $ereg = '<td bgcolor=......><a href=javascript:playVideos\((.{1,10})\); title="(.{1,50})"><b>(.{1,50})<\/b><\/a><\/td><td bgcolor=......><a href=http:\/\/fr.music.yahoo.com\/ar-(.{1,50})><font title="(.{1,50})">(.{1,50})<\/font><\/a><\/td><td bgcolor=...... align=center class="yss_right'; preg_match_all("/$ereg/s", $contenu, $valeur); foreach($valeur[2] as $key=>$val){ Modified: trunk/module/dailymotion/index1.php =================================================================== --- trunk/module/dailymotion/index1.php 2007-05-22 21:38:57 UTC (rev 158) +++ trunk/module/dailymotion/index1.php 2007-05-23 15:01:43 UTC (rev 159) @@ -15,7 +15,7 @@ $smarty->assign('TITRE','Vid\xE9os Dailymotion - '.$title[$show]); function get_videos_id($page){ - $xml = simplexml_load_file($page); + $xml = simplexml_load_file_cache($page,2); if(count($xml->channel->item)!=0){ foreach($xml->channel->item as $item){ $img = ''; Modified: trunk/module/ephemeride/index1.php =================================================================== --- trunk/module/ephemeride/index1.php 2007-05-22 21:38:57 UTC (rev 158) +++ trunk/module/ephemeride/index1.php 2007-05-23 15:01:43 UTC (rev 159) @@ -5,23 +5,23 @@ $monthes = array('','Janvier', 'Février', 'Mars', 'Avril', 'Mai', 'Juin', 'Juillet','Aout', 'Septembre', 'Octobre', 'Novembre', 'Décembre'); $day = array('Dimanche','Lundi','Mardi','Mercredi','Jeudi','Vendredi','Samedi'); -$contenu = file_get_contents("http://www.ephemeride.com/free/fete.jsp", "r"); +$contenu = file_get_contents_cache("http://www.ephemeride.com/free/fete.jsp", 12); $ereg = '<font class="FeteHomme">(.{1,30})<\/font>'; preg_match("/$ereg/s", $contenu, $valeur); $fetes=stripslashes(html_entity_decode($valeur[1])); -$contenu = file_get_contents("http://www.ephemeride.com/free/dicton.jsp", "r"); +$contenu = file_get_contents_cache("http://www.ephemeride.com/free/dicton.jsp", 12); $ereg = '<tr><td class="fmb" style="padding:2px" height="60">(.{1,300})<br><center>'; preg_match("/$ereg/s", $contenu, $valeur); $dicton = stripslashes(html_entity_decode($valeur[1])); -$contenu = file_get_contents("http://www.ephemeride.com/free/citation.jsp", "r"); +$contenu = file_get_contents_cache("http://www.ephemeride.com/free/citation.jsp", 12); $ereg = '<tr><td class="fmb" style="padding:2px" height="60">(.{1,300})<div align="right"><span class="cita"><b>(.{1,30})<\/b><\/span><\/div>'; preg_match("/$ereg/s", $contenu, $valeur); $citation = stripslashes(html_entity_decode($valeur[1])); $auteur = stripslashes(html_entity_decode($valeur[2])); -$contenu = file_get_contents("http://www.ephemeride.com/free/proverbe.jsp", "r"); +$contenu = file_get_contents_cache("http://www.ephemeride.com/free/proverbe.jsp", 12); $ereg = '<td class="fmb" style="padding:2px" height="60">(.{1,300})<br><center>'; preg_match("/$ereg/s", $contenu, $valeur); $proverbe = stripslashes(html_entity_decode($valeur[1])); Deleted: trunk/module/films/playba.php =================================================================== --- trunk/module/films/playba.php 2007-05-22 21:38:57 UTC (rev 158) +++ trunk/module/films/playba.php 2007-05-23 15:01:43 UTC (rev 159) @@ -1,47 +0,0 @@ -<?php -$RACINE_REP = "../../"; -require($RACINE_REP.'_framework/framework.php'); -$BACKGROUND='none'; - -if($pagerecherche = @file_get_contents('http://www.cinemovies.fr/players/video.php?IDBA='.$_REQUEST['toplay'])){ - -$ereg = '<embed src="(.{1,150})" width'; -preg_match("/$ereg/s", $pagerecherche, $valeur); - if(isset($valeur[1])){ - $basename=$valeur[1]; - }else{ - $ereg = '<param name="filename" value="(.{1,120})wmv">'; - preg_match("/$ereg/s", $pagerecherche, $valeur); - $basename=$valeur[1].'wmv'; - } -} - -play_fichier('type=40',str_replace(' ','%20',$basename),0,'ba',$_REQUEST['titre']); - - $LINK['stop']=$MODULE.'films/lecture.php?control=stop'; - $LINK['play']=$MODULE.'films/lecture.php?control=play'; - $LINK['pause']=$MODULE.'films/lecture.php?control=pause'; - $LINK['info']=$MODULE.'films/info.php'; - $LINK['options']=$MODULE.'films/info.php'; - $LINK['blue']=$MODULE.'films/lecture.php?savesignet=1'; - $LINK['red']=$MODULE.'films/lecture.php?next_ss=1'; - $LINK['yellow']=$MODULE.'films/info.php?module=infos'; - $LINK['up']=$MODULE.'films/lecture.php?seek_value=plus'; - $LINK['down']=$MODULE.'films/lecture.php?seek_value=moins'; - - // BDE - RequestID 1588902 - $LINK['next']=$MODULE.'films/lecture.php?control=next'; - $LINK['prev']=$MODULE.'films/lecture.php?control=previous'; - $LINK['rev']=$MODULE.'films/lecture.php?seek_value=moins'; - $LINK['fwd']=$MODULE.'films/lecture.php?seek_value=plus'; - -?> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> -<html> -<head> -<meta name="refresh" content="0;url=lecture.php"> -<script language="javascript" src="/fb2ie.js"> -</script> -</head> -<body></body></html> - Modified: trunk/module/guidetv/tvprogram.php =================================================================== --- trunk/module/guidetv/tvprogram.php 2007-05-22 21:38:57 UTC (rev 158) +++ trunk/module/guidetv/tvprogram.php 2007-05-23 15:01:43 UTC (rev 159) @@ -40,7 +40,7 @@ function infos_emissions($id,$debut,$fin){ if($id!=''){ $infos = true; - $contenu_html = file_get_contents ('http://telepoche.guidetele.com/fiche/emi_'.$id); + $contenu_html = file_get_contents_cache ('http://telepoche.guidetele.com/fiche/emi_'.$id,24); $ereg = "<span class=\"noir11\">(.{1,1000})<\/span><br \/>"; preg_match("/$ereg/s",$contenu_html, $content); @@ -93,7 +93,7 @@ function programme_chaine($chaine, $jour){ - $contenu_html = file_get_contents('http://telepoche.guidetele.com/gtvnew/journee?openagent&c='.$chaine['id'].'&d='.$jour.'&h=0'); + $contenu_html = file_get_contents_cache('http://telepoche.guidetele.com/gtvnew/journee?openagent&c='.$chaine['id'].'&d='.$jour.'&h=0',48); $ereg = "showmenu\('(.{1,3})h(.{1,3})-(.{1,3})h(.{1,3})<br> (.{1,40})<br> Showview : (.{1,8})','(.{1,100})'\)\" onMouseout=\"hidemenu\(\)\" onclick=\"(.{1,80})\""; preg_match_all("/$ereg/s", utf8_encode($contenu_html), $valeurs); Modified: trunk/module/mp3/paroles.php =================================================================== --- trunk/module/mp3/paroles.php 2007-05-22 21:38:57 UTC (rev 158) +++ trunk/module/mp3/paroles.php 2007-05-23 15:01:43 UTC (rev 159) @@ -16,7 +16,7 @@ if (isset($_REQUEST['hid'])) { $hid = urldecode($_REQUEST['hid']); - $xml2 = simplexml_load_file('http://api.leoslyrics.com/api_lyrics.php?auth=leolyrics5&hid='.urlencode($hid)); + $xml2 = simplexml_load_file_cache('http://api.leoslyrics.com/api_lyrics.php?auth=leolyrics5&hid='.urlencode($hid),1); $CONTENT .= utf8_decode($xml2->lyric->artist->name).' - '.utf8_decode($xml2->lyric->album->name).' - '.utf8_decode($xml2->lyric->title).'<br> <br>'; $CONTENT .= nl2br(utf8_decode($xml2->lyric->text)); @@ -35,14 +35,8 @@ $artist = $id3->artists; $name = $id3->name; } - $file='http://api.leoslyrics.com/api_search.php?auth=leolyrics5&artist='.urlencode($artist).'&songtitle='.urlencode($name); - if($handle = fopen ($file, "r")){ - while (!feof ($handle)) { - $fichierxml.= trim(fgets($handle, 4096)); - } - } - fclose($handle); - $xml = simplexml_load_string($fichierxml); + + $xml = simplexml_load_file_cache($file,1); for ($i=0;$i<=20;$i++){ if($xml->searchResults->result[$i]->title!=""){ $c=1; @@ -52,7 +46,7 @@ $c++; } if ($xmlb[$i][3]=="true"){ - $xml2 = simplexml_load_file('http://api.leoslyrics.com/api_lyrics.php?auth=leolyrics5&hid='.urlencode($xmlb[$i][2])); + $xml2 = simplexml_load_file_cache('http://api.leoslyrics.com/api_lyrics.php?auth=leolyrics5&hid='.urlencode($xmlb[$i][2]),1); $CONTENT .= utf8_decode($xml2->lyric->artist->name).' - '.utf8_decode($xml2->lyric->album->name).' - '.utf8_decode($xml2->lyric->title).'<br> <br>'; $CONTENT .= nl2br(utf8_decode($xml2->lyric->text)); break; Modified: trunk/module/mp3/podcast.php =================================================================== --- trunk/module/mp3/podcast.php 2007-05-22 21:38:57 UTC (rev 158) +++ trunk/module/mp3/podcast.php 2007-05-23 15:01:43 UTC (rev 159) @@ -31,7 +31,7 @@ $smarty->assign('ROW',sqlite_fetch_all($result2)); sqlite_close($db); }else{ - $content=file_get_contents($url); + $content=file_get_contents_cache($url,1); $xml = simplexml_load_string(str_replace("itunes:","itunes",$content)); $podcast = array('titre'=>utf8_decode($xml->channel->title),'sommaire'=>utf8_decode($xml->channel->itunessummary)); Modified: trunk/module/recettes/index1.php =================================================================== --- trunk/module/recettes/index1.php 2007-05-22 21:38:57 UTC (rev 158) +++ trunk/module/recettes/index1.php 2007-05-23 15:01:43 UTC (rev 159) @@ -30,10 +30,7 @@ else $numliens = 1; // Sinon alller \xE0 la page 1 - $fp = fopen($categ, "r"); //lecture du fichier - while (!feof($fp)) { //on parcoure toutes les lignes - $contenu .= fgets($fp, 4096); // lecture du contenu de la ligne - } + $contenu = file_get_contents_cache($categ,2); if (isset ($_REQUEST['type'])) { // Si un type pr\xE9cis de liste est donn\xE9 $type = $_REQUEST['type']; Modified: trunk/module/recettes/recettes.php =================================================================== --- trunk/module/recettes/recettes.php 2007-05-22 21:38:57 UTC (rev 158) +++ trunk/module/recettes/recettes.php 2007-05-23 15:01:43 UTC (rev 159) @@ -25,12 +25,8 @@ // Creation de l'URL de l'image associ\xE9e a la recette $urlimg = urlencode('http://' . str_replace("recettes/recette.cfm?num_recette=", "recipephotos/normal/", $url) . '.jpg'); - -$fp = fopen('http://' . urldecode($url), "r"); //lecture du fichier -while (!feof($fp)) { //on parcoure toutes les lignes - $contenu .= fgets($fp, 4096); // lecture du contenu de la ligne -} - + $contenu = file_get_contents_cache('http://' . urldecode($url),2); + // Si le le visiteur demande les informations sur la recette if ($etape == 'info') { Modified: trunk/module/seances/programme_cine.tpl =================================================================== --- trunk/module/seances/programme_cine.tpl 2007-05-22 21:38:57 UTC (rev 158) +++ trunk/module/seances/programme_cine.tpl 2007-05-23 15:01:43 UTC (rev 159) @@ -1,4 +1,4 @@ -<font size="4">{$TITRE2}</font> +<font size="4">{$TITRE2}</font><br> {if $MIN!=0} {assign var=temp value=$MIN-3|max:0} {attribbouton touche="green" lien="voirsalle.php?salle=$s&min=$temp"} Modified: trunk/module/seances/voirsalle.php =================================================================== --- trunk/module/seances/voirsalle.php 2007-05-22 21:38:57 UTC (rev 158) +++ trunk/module/seances/voirsalle.php 2007-05-23 15:01:43 UTC (rev 159) @@ -21,15 +21,8 @@ $serverDefaultPage="http://www.allocine.fr/seance/salle_gen_csalle=$s"; -$page = @fopen ($serverDefaultPage, 'r') - or die('Impossible d\'ouvrir la page '.$serverDefaultPage); +$contenu_html = file_get_contents_cache($serverDefaultPage, 2); -$contenu_html = ''; -while (!feof ($page)) { - $contenu_html .= trim(fgets($page, 4096)); - } - - $ereg = '<h1 style="color: #D20000"><b>(.{1,30})<\/b>'; preg_match("/$ereg/s", $contenu_html, $valeur); $cine = $valeur[1]; Modified: trunk/module/stage6/index1.php =================================================================== --- trunk/module/stage6/index1.php 2007-05-22 21:38:57 UTC (rev 158) +++ trunk/module/stage6/index1.php 2007-05-23 15:01:43 UTC (rev 159) @@ -14,7 +14,7 @@ $smarty->assign('TITRE','Vid\xE9os Stage6 - '.$title[$show]); function get_videos_id($page){ - $xml = simplexml_load_file($page); + $xml = simplexml_load_file_cache($page,2); if(count($xml->channel->item)!=0){ foreach($xml->channel->item as $item){ $img = ''; @@ -35,7 +35,7 @@ if($show=='rec'){ }else{ - $contenu = str_replace("\n",'',@file_get_contents($url2)); + $contenu = str_replace("\n",'',@file_get_contents_cache($url2,1)); $ereg = '\?page=(.{1,6})\'>(.{1,6})<\/a> <a class=\'pagination-number pagination-right'; preg_match("/$ereg/s", $contenu, $valeur); return $valeur[2]*18; Modified: trunk/module/youtube/index1.php =================================================================== --- trunk/module/youtube/index1.php 2007-05-22 21:38:57 UTC (rev 158) +++ trunk/module/youtube/index1.php 2007-05-23 15:01:43 UTC (rev 159) @@ -15,7 +15,7 @@ $smarty->assign('TITRE','Vid\xE9os Youtube - '.$title[$show]); function get_videos_id($page){ - $contenu = str_replace("\n",'',@file_get_contents($page)); + $contenu = str_replace("\n",'',@file_get_contents_cache($page,2)); $ereg = '<a href="\/watch\?v=(.{1,12})"><img src="(.{1,200})" class=" vimg " alt="video" \/><\/a><\/div> <\/div> <div class="vtitle"> <a href="\/watch\?v=(.{1,12})" onclick="_hbLink\(\'(.{0,100})\',\'(.{1,50})\'\);">(.{1,100})<\/a><br\/> <span class="runtime">(.{1,10})<\/span>'; preg_match_all("/$ereg/s", $contenu, $valeur); foreach($valeur[1] as $key=>$val){ @@ -25,7 +25,7 @@ } function get_recherche($rec,$page){ - $contenu = str_replace("\n",'',@file_get_contents('http://www.youtube.com/results?search_query='.urlencode($rec).'&search=Search&page='.$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>'; preg_match_all("/$ereg/s", $contenu, $valeur); foreach($valeur[1] as $key=>$val){ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ara...@us...> - 2007-05-22 21:39:00
|
Revision: 158 http://svn.sourceforge.net/easybox-mod/?rev=158&view=rev Author: aragornis Date: 2007-05-22 14:38:57 -0700 (Tue, 22 May 2007) Log Message: ----------- v4.1.1 Modified Paths: -------------- trunk/_framework/dwl.php trunk/_utilisateur/modules.db trunk/_utilisateur/multiposte.m3u trunk/module/modules/index1.php trunk/version.html Modified: trunk/_framework/dwl.php =================================================================== --- trunk/_framework/dwl.php 2007-05-22 20:39:47 UTC (rev 157) +++ trunk/_framework/dwl.php 2007-05-22 21:38:57 UTC (rev 158) @@ -23,7 +23,7 @@ if(module_exists($nom)){ sup_module(get_id_of_module($nom)); } - add_module($nom, $nom.'/', '', '', '', '', '', '', $version, $description, 'Skin', 'Alone', ''); + add_module($nom, strtolower(supprime_accents($nom)).'/', '', '', '', '', '', '', $version, $description, 'Skin', 'Alone', ''); $txt_dwl = "T\xE9l\xE9chargement de la skin termin\xE9e."; $nom = ''; }elseif($dwl == "Module"){ Modified: trunk/_utilisateur/modules.db =================================================================== (Binary files differ) Modified: trunk/_utilisateur/multiposte.m3u =================================================================== --- trunk/_utilisateur/multiposte.m3u 2007-05-22 20:39:47 UTC (rev 157) +++ trunk/_utilisateur/multiposte.m3u 2007-05-22 21:38:57 UTC (rev 158) @@ -199,6 +199,8 @@ rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=480 #EXTINF:0,183 - CCTV Divertissement rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=470 +#EXTINF:0,184 - La chaîne chinoise +rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=471 #EXTINF:0,185 - Beijing TV rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=472 #EXTINF:0,186 - Shangai Dragon TV @@ -423,6 +425,38 @@ 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) +rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=625 +#EXTINF:0,603 - France 3 (h264) +rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=626 +#EXTINF:0,605 - France 5 (h264) +rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=627 +#EXTINF:0,606 - M6 (h264) +rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=628 +#EXTINF:0,607 - Arte (h264) +rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=629 +#EXTINF:0,608 - Direct 8 (h264) +rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=630 +#EXTINF:0,609 - W9 (h264) +rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=631 +#EXTINF:0,610 - TMC (h264) +rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=632 +#EXTINF:0,611 - NT1 (h264) +rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=633 +#EXTINF:0,612 - NRJ 12 (h264) +rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=634 +#EXTINF:0,613 - La Chaîne Parlementaire (h264) +rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=635 +#EXTINF:0,614 - France 4 (h264) +rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=636 +#EXTINF:0,615 - BFM TV (h264) +rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=637 +#EXTINF:0,616 - i>TELE (h264) +rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=638 +#EXTINF:0,617 - Europe 2 TV (h264) +rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=639 +#EXTINF:0,618 - Gulli (h264) +rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=640 #EXTINF:0,10001 - Europe 1 #EXTVLCOPT:ts-es-id-pid #EXTVLCOPT:no-video @@ -758,3 +792,13 @@ #EXTVLCOPT:no-video #EXTVLCOPT:audio-track-id=1005 rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=110070 +#EXTINF:0,10071 - Radio Junior +#EXTVLCOPT:ts-es-id-pid +#EXTVLCOPT:no-video +#EXTVLCOPT:audio-track-id=1003 +rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=110071 +#EXTINF:0,10072 - Canal Académie +#EXTVLCOPT:ts-es-id-pid +#EXTVLCOPT:no-video +#EXTVLCOPT:audio-track-id=1006 +rtsp://mafreebox.freebox.fr/freeboxtv/stream?id=110072 Modified: trunk/module/modules/index1.php =================================================================== --- trunk/module/modules/index1.php 2007-05-22 20:39:47 UTC (rev 157) +++ trunk/module/modules/index1.php 2007-05-22 21:38:57 UTC (rev 158) @@ -67,8 +67,8 @@ foreach($xml3->element as $element){ if(utf8_decode($element->nom)==$_GET['installnewskin']){ - download_file($ini['download']['patch'].utf8_decode($element->fichier), $RACINE_REP.'skin/'.utf8_decode($element->nom).'/'); - add_module(utf8_decode($element->nom), utf8_decode($element->nom).'/', '', '', '', '', '', '', utf8_decode($element->version), utf8_decode($element->description), 'Skin', 'Alone', ''); + download_file($ini['download']['patch'].utf8_decode($element->fichier), $RACINE_REP.'skin/'.strtolower(str_replace(' ','',supprime_accents(utf8_decode($element->nom)))).'/'); + add_module(utf8_decode($element->nom), strtolower(str_replace(' ','',supprime_accents(utf8_decode($element->nom)))).'/', '', '', '', '', '', '', utf8_decode($element->version), utf8_decode($element->description), 'Skin', 'Alone', ''); add_download($element->nom); } //-- R\xE9initialise la liste des modules Modified: trunk/version.html =================================================================== --- trunk/version.html 2007-05-22 20:39:47 UTC (rev 157) +++ trunk/version.html 2007-05-22 21:38:57 UTC (rev 158) @@ -4,6 +4,6 @@ </head> <body> <h1>Easybox</h1> -<h2>4.1.0</h2> +<h2>4.1.1</h2> </body> </html> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ara...@us...> - 2007-05-22 20:39:50
|
Revision: 157 http://svn.sourceforge.net/easybox-mod/?rev=157&view=rev Author: aragornis Date: 2007-05-22 13:39:47 -0700 (Tue, 22 May 2007) Log Message: ----------- v4.1.0 Modified Paths: -------------- trunk/_utilisateur/modules.db trunk/version.html Modified: trunk/_utilisateur/modules.db =================================================================== (Binary files differ) Modified: trunk/version.html =================================================================== --- trunk/version.html 2007-05-22 19:34:43 UTC (rev 156) +++ trunk/version.html 2007-05-22 20:39:47 UTC (rev 157) @@ -4,6 +4,6 @@ </head> <body> <h1>Easybox</h1> -<h2>4.0.4</h2> +<h2>4.1.0</h2> </body> </html> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <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-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: <cra...@us...> - 2007-05-20 22:42:26
|
Revision: 154 http://svn.sourceforge.net/easybox-mod/?rev=154&view=rev Author: craftsnux Date: 2007-05-20 15:42:20 -0700 (Sun, 20 May 2007) Log Message: ----------- utilisation du fichier etc/mtab plutot que fstab pour avoir les disques r?\195?\169ellement pr?\195?\169sentset am?\195?\169lioration de l'affichage Modified Paths: -------------- trunk/_framework/demarrage.php trunk/_framework/fonctions_partagees.inc.php Modified: trunk/_framework/demarrage.php =================================================================== --- trunk/_framework/demarrage.php 2007-05-20 10:21:51 UTC (rev 153) +++ trunk/_framework/demarrage.php 2007-05-20 22:42:20 UTC (rev 154) @@ -82,7 +82,7 @@ clean_vars(); // R\xE9cup\xE9ration des disques - if (PHP_OS == "WIN32" || PHP_OS == "WINNT" || is_readable('/etc/fstab')) { + if (PHP_OS == "WIN32" || PHP_OS == "WINNT" || is_readable('/etc/mtab')) { save_variable('disques', serialize(DISQUES())); } Modified: trunk/_framework/fonctions_partagees.inc.php =================================================================== --- trunk/_framework/fonctions_partagees.inc.php 2007-05-20 10:21:51 UTC (rev 153) +++ trunk/_framework/fonctions_partagees.inc.php 2007-05-20 22:42:20 UTC (rev 154) @@ -234,6 +234,16 @@ } RETURN $nomcourant; } +function extract_lastname($name){ + $nomcourant = str_replace("\\", "/", $name); + if($pos = strrpos($nomcourant,"/")){ + $pos++; + $nomcourant = substr($nomcourant,$pos); + }else{ + $nomcourant=$name; + } +RETURN $nomcourant; +} //Sauvegarder un signet function save_signet(){ @@ -305,24 +315,40 @@ $obj = null; } - } elseif (is_readable('/etc/fstab')) { + } elseif (is_readable('/etc/mtab')) { // si ce fichier est lisible on assume qu'on est sur un OS qui le supporte // Noter que c'est une facon pour un autre OS que Linux ou Windows de faire // en sorte que easybox puisse acc\xE9der aux disques! - $fstab =& new File_Fstab(); + $fstab =& new File_Fstab(array('file' => '/etc/mtab')); foreach($fstab->entries as $io) { // On n'a pas la description hardware du type de disque, // mais on sait qu'un CD-ROM ou un DVD sont pratiquement // toujours de type cd9660 pour mac, udf ou iso9660 - // A priori on pourrait ajouter 'auto' dans les types accept\xE9s, - // mais en pratique ca revient a rajouter une entr\xE9e pour - // le... lecteur de disquettes. - if (strstr($io->getFsType(),'udf') || strstr($io->getFsType(),'iso9660') || strstr($io->getFsType(),'cd9660')) { - $lect[] = array('lettre'=>$io->getDevice(), 'path'=>$io->getMountPoint(), 'type'=>'Disque optique', 'nom'=>$io->getMountPoint(), 'gif'=>'diskoptical'); - } elseif (! strstr($io->getFsType(),'proc')) { - // Bon, on se souviens quand-meme des autres, sauf /proc car faut pas pousser - $lect[] = array('lettre'=>$io->getDevice(), 'path'=>$io->getMountPoint(), 'type'=>'Inconnu', 'nom'=>$io->getMountPoint(), 'gif'=>'diskunknown'); + // + if ( strstr($io->getFsType(),'proc')|| + strstr($io->getFsType(),'swap')|| + strstr($io->getDevice(),'none')|| + strstr($io->getDevice(),'fd')|| + strstr($io->getMountPoint(),'floppy')|| + strstr($io->getMountPoint(),'proc')|| + strstr($io->getMountPoint(),'var') + ) { + //on ne se souvient pas du lecteur de disquette, de swap, de /proc, et des non-identifi\xE9s + } elseif ( strstr($io->getFsType(),'udf') || + strstr($io->getFsType(),'iso9660') || + strstr($io->getFsType(),'cd9660') || + strstr($io->getFsType(),'auto')|| + strstr($io->getFsType(),'supermount') + ) { + // on racourcit les noms, on prend le repertoire de montage qui est plus significatif + $lect[] = array('lettre'=>extract_lastname($io->getMountPoint()), 'path'=>$io->getMountPoint(), 'type'=>'Disque optique', 'nom'=>$io->getMountPoint(), 'gif'=>'diskoptical'); + } elseif ( strstr($io->getFsType(),'fat')|| + strstr($io->getFsType(),'ext') + ) { + $lect[] = array('lettre'=>extract_lastname($io->getMountPoint()), 'path'=>$io->getMountPoint(), 'type'=>'Disque dur', 'nom'=>$io->getMountPoint(), 'gif'=>'diskhdd'); + } else { + $lect[] = array('lettre'=>extract_lastname($io->getMountPoint()), 'path'=>$io->getMountPoint(), 'type'=>'Inconnu', 'nom'=>$io->getMountPoint(), 'gif'=>'diskunknown'); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |