Menu
▾
▴
[Easybox-mod-developers] SF.net SVN: easybox-mod: [84] trunk
|
From: <ara...@us...> - 2007-02-23 21:42:28
|
Revision: 84
http://svn.sourceforge.net/easybox-mod/?rev=84&view=rev
Author: aragornis
Date: 2007-02-23 13:42:19 -0800 (Fri, 23 Feb 2007)
Log Message:
-----------
Possibilit?\195?\169 de lire des mp3 pendant les diaporama
Echange des notes visiteurs/presse r?\195?\169solu ds la lib allocin?\195?\169
Commencement de la refonte totale du module rss
Possibilit?\195?\169 de cacher la barre d'outil lors d'un diaporama avec la touche info
Correction du listing des mp3 dans la playlist
Quand on lance un nouveau mp3, la playlist reste au niveau de ce mp3
Correction de l'importation d'images depuis google
Suppression du fond d'?\195?\169cran sur la page d'erreur
Modified Paths:
--------------
trunk/_framework/fonctions_partagees.inc.php
trunk/_framework/lib/get_info.php
trunk/_utilisateur/rss.db
trunk/configuration/rss.php
trunk/erreur.php
trunk/module/_explorateur/explorateur.tpl
trunk/module/_explorateur/index1.php
trunk/module/diaporama/index1.php
trunk/module/diaporama/photo.tpl
trunk/module/films/info.php
trunk/module/modules/modules.tpl
trunk/module/mp3/jaquette.php
trunk/module/mp3/lecteuraudio.php
trunk/module/mp3/playdb.php
trunk/module/mp3/playlist_audio.tpl
trunk/module/rss/index1.php
trunk/module/rss/rss.tpl
trunk/module/signet/index1.php
trunk/skin/simple/framework_skin.php
trunk/skin/simplegreen/couleur.conf
trunk/skin/simplegreen/interface/barre1.gif
trunk/skin/simplegreen/interface/barre2.gif
trunk/skin/simplegreen/interface/barre3.gif
trunk/skin/simplegreen/interface/player.gif
trunk/skin/simplegreen/interface.tpl
Added Paths:
-----------
trunk/module/diaporama/zik.gif
Removed Paths:
-------------
trunk/lecteur/options.php
trunk/skin/simple/option.tpl
trunk/skin/simplegreen/option.tpl
Modified: trunk/_framework/fonctions_partagees.inc.php
===================================================================
--- trunk/_framework/fonctions_partagees.inc.php 2007-02-23 11:42:46 UTC (rev 83)
+++ trunk/_framework/fonctions_partagees.inc.php 2007-02-23 21:42:19 UTC (rev 84)
@@ -53,7 +53,12 @@
$query = sqlite_query($db,'SELECT * FROM var WHERE var=\''.$var.'\' LIMIT 1');
$result = sqlite_fetch_all($query, SQLITE_ASSOC);
sqlite_close($db);
- RETURN($result[0]['value']);
+ if(sqlite_num_rows($query)>=1){
+ RETURN($result[0]['value']);
+ }else{
+ RETURN false;
+ }
+
}
//Supprime les variables de session
Modified: trunk/_framework/lib/get_info.php
===================================================================
--- trunk/_framework/lib/get_info.php 2007-02-23 11:42:46 UTC (rev 83)
+++ trunk/_framework/lib/get_info.php 2007-02-23 21:42:19 UTC (rev 84)
@@ -112,8 +112,8 @@
//Critique visiteurs
$ereg = 'notepresse=(.{0,10})¬epublic=(.{0,10})';
preg_match("/$ereg/s", $filmrecherche, $valeur);
- $res['critique_visiteurs'] = round(ereg_replace(",", ".", $valeur[1]));
- $res['critique_presse'] = round(ereg_replace(",", ".", $valeur[2]));
+ $res['critique_visiteurs'] = round(ereg_replace(",", ".", $valeur[2]));
+ $res['critique_presse'] = round(ereg_replace(",", ".", $valeur[1]));
//R\xE9cup\xE9ration de l'adresse de l'image
$ereg = '<img src="http:\/\/a69.g.akamai.net\/n\/69\/10688\/v1\/img5.allocine.fr\/(.{1,70})" border="0" alt="" class="affichette" \/>';
Modified: trunk/_utilisateur/rss.db
===================================================================
(Binary files differ)
Modified: trunk/configuration/rss.php
===================================================================
--- trunk/configuration/rss.php 2007-02-23 11:42:46 UTC (rev 83)
+++ trunk/configuration/rss.php 2007-02-23 21:42:19 UTC (rev 84)
@@ -33,7 +33,7 @@
for ($i=0; $i<=((count($signetsav)/2)-1); $i++) {
sqlite_query($db,'INSERT INTO feeds VALUES(
"'.$index++.'",
- "'.$row['name'].'",
+ "'.$row['id'].'",
"'.stripslashes($signetsav[(2*$i)]).'",
"'.$signetsav[(2*$i)+1].'")');
}
@@ -45,30 +45,30 @@
$resultsave = sqlite_query($db,$requete);
while ($row = sqlite_fetch_array($result)) {
- $requete2="SELECT * FROM feeds WHERE cat = '".$row[name]."'";
+ $requete2="SELECT * FROM feeds WHERE cat = '".$row['id']."'";
$result2 = sqlite_query($db,$requete2);
?>
- <u><?= $row[name]; ?></u> <a href="index1.php?page=7&delcat=<?= $row[id]; ?>">[x]</a>
- <table><tr><td valign="middle"><select ondblclick="window.open('edit.php?form=form1&select=<?= $row[name]; ?>&id=' + document.getElementById('list<?= $row[name]; ?>').selectedIndex,'_blank','toolbar=0,location=0,directories=0,status=0,scrollbars=1,resizable=0,copyhistory=0,menuBar=0,width=800,height=250');" onchange="maj('<?= $row[name]; ?>')" size="<?= max((sqlite_num_rows($result2)+2),6); ?>" name="list<?= $row[name]; ?>" id="list<?= $row[name]; ?>" style="width:350;border: thin outset;font-size: 9px;" multiple="multiple">
+ <u><?= $row['name']; ?></u> <a href="index1.php?page=7&delcat=<?= $row[id]; ?>">[x]</a>
+ <table><tr><td valign="middle"><select ondblclick="window.open('edit.php?form=form1&select=<?= $row['name']; ?>&id=' + document.getElementById('list<?= $row['name']; ?>').selectedIndex,'_blank','toolbar=0,location=0,directories=0,status=0,scrollbars=1,resizable=0,copyhistory=0,menuBar=0,width=800,height=250');" onchange="maj('<?= $row[name]; ?>')" size="<?= max((sqlite_num_rows($result2)+2),6); ?>" name="list<?= $row['name']; ?>" id="list<?= $row['name']; ?>" style="width:350;border: thin outset;font-size: 9px;" multiple="multiple">
<?php
$i=0;
while ($row2 = sqlite_fetch_array($result2)) {
- echo '<option value="'.$row2[name].'|'.$row2[add].'">'.$row2[name].'</option>';
+ echo '<option value="'.$row2['name'].'|'.$row2['add'].'">'.$row2['name'].'</option>';
}
?>
</select></td><td>
<br>
- <input type="button" value="↑" onClick="TriListe('<?= $row[name]; ?>','-')"><br>
- <input type="button" value="-" onClick="effacer('<?= $row[name]; ?>')"><br>
- <input type="button" value="↓" onClick="TriListe('<?= $row[name]; ?>','+')">
+ <input type="button" value="↑" onClick="TriListe('<?= $row['name']; ?>','-')"><br>
+ <input type="button" value="-" onClick="effacer('<?= $row['name']; ?>')"><br>
+ <input type="button" value="↓" onClick="TriListe('<?= $row['name']; ?>','+')">
</td></tr></table>
- <input name="<?= $row[name]; ?>" id="<?= $row[name]; ?>" type="hidden" style="border: thin outset;font-size: 9px;" size="10000" value="">
+ <input name="<?= $row['name']; ?>" id="<?= $row['name']; ?>" type="hidden" style="border: thin outset;font-size: 9px;" size="10000" value="">
<script language="Javascript">
maj('<?= $row[name]; ?>');
@@ -86,7 +86,7 @@
<select name="choix" id="addchoix" style="border: thin outset;font-size: 9px;">
<?
while ($res = sqlite_fetch_array($resultsave)) {
- echo '<option value="'.$res[name].'">'.$res[name].'</option>';
+ echo '<option value="'.$res['name'].'">'.$res['name'].'</option>';
}
sqlite_close($db);
?>
Modified: trunk/erreur.php
===================================================================
--- trunk/erreur.php 2007-02-23 11:42:46 UTC (rev 83)
+++ trunk/erreur.php 2007-02-23 21:42:19 UTC (rev 84)
@@ -2,6 +2,8 @@
$RACINE_REP = "";
require($RACINE_REP.'_framework/framework.php');
+$BACKGROUND = 'none';
+
$META['refresh'] = '0;url=/_framework/demarrage.php';
$CONTENT = 'Une erreur est survenue. Une page n\'a pas \xE9t\xE9 trouv\xE9e ou n\'a pas \xE9t\xE9 ex\xE9cut\xE9e correctement. Easybox va red\xE9marrer...';
Deleted: trunk/lecteur/options.php
===================================================================
--- trunk/lecteur/options.php 2007-02-23 11:42:46 UTC (rev 83)
+++ trunk/lecteur/options.php 2007-02-23 21:42:19 UTC (rev 84)
@@ -1,96 +0,0 @@
-<?php
-$RACINE_REP = "../";
-require($RACINE_REP.'_framework/framework.php');
-
-$module=$_GET['module'];
-
-
-$LINK['red']=$RACINE_REP.'module/films/info.php';
-$LINK['options']=$RACINE_REP.'module/films/info.php';
-
-$smarty->assign('module',$module);
-
-
-if (isset($_GET['video'])){
- @readfile('http://localhost:8081/lecteur/modif-config.html?type=3&video='.$_GET['video'].'&pp='.$_GET['pp']);
-}
-if (isset($_GET['audio'])){
- @readfile('http://localhost:8081/lecteur/modif-config.html?type=2&type2=1&var=audio-es&value='.$_GET['audio']);
-}
-if (isset($_GET['sstitre'])){
- @readfile('http://localhost:8081/lecteur/modif-config.html?type=2&type2=2&var=spu-es&value='.$_GET['sstitre'].'&size='.$_GET['fontsize'].'&sub_margin='.$_GET['sub_margin'].'&color='.$_GET['fontcolor']);
-}elseif(isset($_GET['fontcolor'])){
- @readfile('http://localhost:8081/lecteur/modif-config.html?type=2&type2=2&var=spu-es&value=0&size='.$_GET['fontsize'].'&sub_margin='.$_GET['sub_margin'].'&color='.$_GET['fontcolor']);
-}
-if (isset($_GET['chap'])){
- @readfile('http://localhost:8081/lecteur/modif-config.html?type=2&type2=3&var=chapter&value='.$_GET['chap']);
-}
-
-//-- R\xE9cuperation des donn\xE9es de VLC
-$contenu_html = @file_get_contents('http://localhost:8081/lecteur/options_vlc.html');
-eval($contenu_html);
-
-if($module=='infos'){
-$disable=1;
-
-$nomcourant = str_replace("\\", "/", $VLC['name_current']);
-$pos = strrpos($nomcourant,"/");
-$pos++;
-$nomcourant = substr($nomcourant,$pos);
-$nomcourant = trim(substr($nomcourant,0,strrpos($nomcourant,'.')));
-$fichier = $VLC['url_current'];
-$film=$nomcourant;
-
- include($MODULE.'films/fichefilm.php');
- $smarty->assign('content',$contenant);
-}
-
-//-- Choix du format Video
-if($module=='video'){
-$smarty->assign('video',$video);
-$smarty->assign('pp_video',$pp_video);
-}
-
-//Choix de la piste audio
-if($module=='audio'){
-$smarty->assign('audio',$audio);
-}
-
-//Choix du fichier de sous-titre
-if($module=='sstitre'){
-
-foreach($sub_margin as $key => $value){
- $_sub_margin = $key;
-}
-foreach($fontcolor as $key => $value){
- $_fontcolor = $key;
-}
-foreach($ffontsize as $key => $value){
- $_ffontsize = $key;
-}
-if($_fontcolor =="" OR $_fontcolor == "0"){
- $_fontcolor = '16777215';
-}
-if($_ffontsize =="" OR $_ffontsize == "0"){
- $_ffontzise = '32';
-}
-
-$smarty->assign('ffontsize',$_ffontsize);
-$smarty->assign('fontcolor',$_fontcolor);
-$smarty->assign('sub_margin',$_sub_margin);
-$smarty->assign('sstitre',$sstitre);
-}
-
-
-//Choix du chapitre
-if($module=='navigation'){
-$smarty->assign('chapitre',$chapitre);
-}
-
-?>
-
-</td></tr></table>
-
-<?php
-$smarty->display('option.tpl');
-?>
Modified: trunk/module/_explorateur/explorateur.tpl
===================================================================
--- trunk/module/_explorateur/explorateur.tpl 2007-02-23 11:42:46 UTC (rev 83)
+++ trunk/module/_explorateur/explorateur.tpl 2007-02-23 21:42:19 UTC (rev 84)
@@ -1,5 +1,4 @@
{assign var=rep_encoded value=$REP|urlencode}
-
{section name=disques loop=$DISQUES}
{if $smarty.section.disques.first}
<table cellspacing="2" align="center" width="498" valign="middle"><tr valign="middle">
@@ -32,31 +31,21 @@
<table width="498" cellpadding="0" cellspacing="0" align="center" valign="middle">
-{if $PLAYREP OR $AFF_FAVORIS}
-<tr><td colspan="2"><center>
-{/if}
+{assign var=N_affich value=$T_affich|@count}
+{assign var=N_affich_reste value=$NUM_ROW_AFFICH|max:15}
-{if $PLAYREP}
-<img src="{$SKIN_REP}dossier/rep_all.gif" border="0" width="20" height="20"><a href="{$PAGE_LECT_REP}?toplay={$REP|urlencode}&type=playrep"> {$PLAYREP_TEXT|default:"Lire le r\xE9pertoire complet"}</a>
-{/if}
-{if $PLAYREP AND $AFF_FAVORIS}
- -
-{/if}
-
-{if $AFF_FAVORIS}
-<img src="{$SKIN_REP}dossier/favoris.gif" width="20" height="20"> <a href="{$RACINE_REP}module/favoris/index1.php?ajout={$REP|urlencode}&nom={$REP}">Ajouter aux favoris</a>
-{/if}
-
-{if $PLAYREP OR $AFF_FAVORIS}
-</center></td></tr>
-{/if}
-
+{*########## Affichage des raccourcis rapides ##########*}
{assign var=curIndex value=1}
{assign var=curTD value=0}
{assign var=curTR value=0}
{assign var=FromValue value=""}
{assign var=ToValue value=""}
+
+{* Nombre de page et pr\xE9paration de la limitation \xE0 10 blocs *}
+{assign var=nb_page value=$N_affich/$NUM_ROW_AFFICH|ceil}
+{assign var=nb_page_par_case value=$nb_page/10|ceil}
+
{* Il faut d\xE9terminer le nombre de caract\xE8re pour afficher le nom des fichiers dans les blocs d'index*}
{if $T_affich|@count/$NUM_ROW_AFFICH<=1}
{assign var=indexLength value=0}
@@ -71,9 +60,9 @@
{/if}
{if $indexLength>0}
- {section name=quickjump loop=$T_affich start=$0}
+ {section name=quickjump loop=$T_affich start=0}
{if $smarty.section.quickjump.first}
- <tr><td><table cellspacing="2" align="center" width="498" valign="middle" border="0"><tr valign="middle">
+ <tr><td colspan="2"><table cellspacing="2" align="center" width="498" valign="middle" border="0"><tr valign="middle">
{/if}
{if $curIndex==1}
{assign var=FromValue value=$T_affich[quickjump]|strip_delimiters|truncate:$indexLength:"":true}
@@ -91,16 +80,11 @@
{/if}
{* Si l'on a le nombre de fichier par page ou que c'est le dernier, alors il faut \xE9crire le bloc*}
- {if $curIndex==$NUM_ROW_AFFICH OR $smarty.section.quickjump.last}
- <td valign="middle" border="1" align="center"><font size='1'><a href="{$PAGE_EXPLO}?start={$curTR*10+$curTD*$NUM_ROW_AFFICH}&directory={$REP|urlencode}&mode={$MODE}">{$FromValue} .. {$ToValue}</a></font></td>
+ {if $curIndex==$nb_page_par_case*$NUM_ROW_AFFICH OR $smarty.section.quickjump.last}
+ <td valign="middle" border="1" align="center"><font size='1'><a href="{$PAGE_EXPLO}?start={$curTR*10+$curTD*$NUM_ROW_AFFICH*$nb_page_par_case}&directory={$REP|urlencode}&mode={$MODE}">{$FromValue} .. {$ToValue}</a></font></td>
{assign var=curTD value=$curTD+1}
{* Chaque ligne du tableau ne peut pas d\xE9passer 10 cellules *}
- {if $curTD==10}
- </tr><tr>
- {assign var=curTR value=$curTR+1}
- {assign var=curTD value=0}
- {/if}
{assign var=curIndex value=0}
{/if}
@@ -112,6 +96,8 @@
{/section}
{/if}
+{*######## Fin Affichage des raccourcis rapides ########*}
+
{if $MIN!=0}
{assign var=temp value=$MIN-$NUM_ROW_AFFICH|max:0}
<tr><td colspan="2"><img src="{$INTERFACE_REP}btn_vert.gif" border="0"> <a href="{$PAGE_EXPLO}?start={$MIN-$NUM_ROW_AFFICH|max:0}&directory={$REP|urlencode}&mode={$MODE}"><font size=2>Pr\xE9c\xE9dent</font></a> <a href="{$PAGE_EXPLO}?start=0&directory={$REP|urlencode}&mode={$MODE}"><font size=2>D\xE9but du r\xE9pertoire</font></a></td></tr>
@@ -133,27 +119,36 @@
{assign var="rep_a_affich" value=$REP|cat:'/'|cat:$T_affich[files]}
<tr><td colspan="2"><img src="{$SKIN_REP}dossier/folder.gif"> <font size="1"><a {if $smarty.section.disques.first==1}focused {/if}href="{$PAGE_EXPLO}?directory={$rep_a_affich|realpath|urlencode}&mode={$MODE}">{$T_affich[files]|truncate:55|strip_delimiters}</a></font></td></tr>
{else}
-<tr><td><img src="{$SKIN_REP}dossier/{$ICONE_FICHIER}" width="16" height="16"> <font size="1"><a {if $smarty.section.disques.first==1}focused {/if}href="{$PAGE_LECT}?{$OPT_LIENS}toplay_file={$T_affich[files]|urlencode}&toplay_rep={$REP|urlencode}">{$T_affich[files]|strip_delimiters|truncate:52}</a>
-</font></td><td width="35">
+<tr><td width="35">
{if $AFF_INFO}
{assign var="nb" value=$T_affich[files]|strrpos:"."}
- <a href="fichefilm.php?start={$MIN}&comeback=expl&film={$T_affich[files]|substr:0:$nb|urlencode}&fichier={$REP|cat:'/'|cat:$T_affich[files]|realpath|urlencode}"><font size="1">info</font></a>
+ <a href="fichefilm.php?start={$MIN}&comeback=expl&film={$T_affich[files]|substr:0:$nb|urlencode}&fichier={$REP|cat:'/'|cat:$T_affich[files]|realpath|urlencode}"><table width="20" height="20" border="0" cellpadding="0" cellspacing="0" bgcolor="{#COULEUR_FOND1#}" abgcolor="{#COULEUR_ALINK#}"><tr height="20"><td align=center width="20" height="20" align="center" valign="middle"><img src="{$INTERFACE_REP}/information.gif" border="0" width="20" height="20"></td></tr></table></a>
{/if}
- </td></tr>
+ </td><td>{if NOT $AFF_INFO}<img src="{$SKIN_REP}dossier/{$ICONE_FICHIER}" width="16" height="16"> {/if}<font size="1"><a {if $smarty.section.disques.first==1}focused {/if}href="{$PAGE_LECT}?{$OPT_LIENS}toplay_file={$T_affich[files]|urlencode}&toplay_rep={$REP|urlencode}">{$T_affich[files]|strip_delimiters|truncate:52}</a>
+</font></td></tr>
{/if}
{/section}
-{assign var=N_affich value=$T_affich|@count}
-{assign var=N_affich_reste value=$NUM_ROW_AFFICH|max:15}
-
{if $MIN+$smarty.section.files.total<count($T_affich)}
-
-<tr><td colspan="2"><img src="{$INTERFACE_REP}btn_bleu.gif" border="0"> <a href="{$PAGE_EXPLO}?start={$MIN+$smarty.section.files.total}&directory={$REP|urlencode}&mode={$MODE}"><font size=2>Suivant</font></a> - <font size=2><a href="{$PAGE_EXPLO}?start={$N_affich-$smarty.section.files.total}&directory={$REP|urlencode}&mode={$MODE}">Fin du r\xE9pertoire</a> - Page {$MIN/$NUM_ROW_AFFICH+1|ceil} / {$N_affich/$NUM_ROW_AFFICH|ceil}</font></td></tr>
+<tr><td colspan="2"><table><tr><td><img src="{$INTERFACE_REP}btn_bleu.gif" border="0"> <a href="{$PAGE_EXPLO}?start={$MIN+$smarty.section.files.total}&directory={$REP|urlencode}&mode={$MODE}"><font size=2>Suivant</font></a> - <font size=2><a href="{$PAGE_EXPLO}?start={$N_affich-$smarty.section.files.total}&directory={$REP|urlencode}&mode={$MODE}">Fin du r\xE9pertoire</a> - Page {$MIN/$NUM_ROW_AFFICH+1|ceil} / {$N_affich/$NUM_ROW_AFFICH|ceil}</font></td>
{assign var=temp value=$MIN+$smarty.section.files.total}
{attribbouton touche="blue" lien="$PAGE_EXPLO?start=$temp&directory=$rep_encoded&mode=$MODE"}
{else}
-<tr><td colspan="2"><font size=2>Page {$MIN/$NUM_ROW_AFFICH+1|ceil} / {$N_affich/$NUM_ROW_AFFICH|ceil}</font></td></tr>
+<tr><td colspan="2"><table><tr><td><font size=2>Page {$MIN/$NUM_ROW_AFFICH+1|ceil} / {$N_affich/$NUM_ROW_AFFICH|ceil}</font></td>
{/if}
+
+
+<td width="30" align="center">
+{if $PLAYREP}
+<a href="{$PAGE_LECT_REP}?toplay={$REP|urlencode}&type=playrep"><table width="20" height="20" border="0" cellpadding="0" cellspacing="0" bgcolor="{#COULEUR_FOND1#}" abgcolor="{#COULEUR_ALINK#}"><tr height="20"><td align=center width="20" height="20" align="center" valign="middle"><img src="{$SKIN_REP}dossier/rep_all.gif" border="0" width="20" height="20"></td></tr></table></a>
+{/if}
+</td><td width="30" align="center">
+{if $AFF_FAVORIS}
+<a href="{$RACINE_REP}module/favoris/index1.php?ajout={$REP|urlencode}&nom={$REP}"><table width="20" height="20" border="0" cellpadding="0" cellspacing="0" bgcolor="{#COULEUR_FOND1#}" abgcolor="{#COULEUR_ALINK#}"><tr height="20"><td align=center width="20" height="20" align="center" valign="middle"><img src="{$SKIN_REP}dossier/favoris.gif" border="0" width="20" height="20"></td></tr></table></a>
+{/if}
+</td></tr></table>
+</td></tr>
+
{if $dvdmod}
<tr><td colspan="2"><a href="index1.php?status=disques">Cliquez ici pour lire un dvd depuis un lecteur optique.</a></td></tr>
{/if}
Modified: trunk/module/_explorateur/index1.php
===================================================================
--- trunk/module/_explorateur/index1.php 2007-02-23 11:42:46 UTC (rev 83)
+++ trunk/module/_explorateur/index1.php 2007-02-23 21:42:19 UTC (rev 84)
@@ -48,20 +48,13 @@
$min = 0;
}
+
// Rechargement des disques
if ($_GET['reload']=="1"){
save_variable('disques', serialize(DISQUES()));
}
- //Ajout dans la base de donn\xE9e pour les retours
- if($extension==$ini['explorateur']['ext']){
- save_variable('lastexpl', 'explorateur');
- save_variable('lastrep', $rep);
- save_variable('rep_min', $min);
- save_variable('retour_fiche_film', 'explorateur');
- }
-
$extv = explode(",",$extension);
$rep = realpath(stripslashes(urldecode($rep)));
@@ -161,6 +154,20 @@
RETURN ($chemin);
}
+ //Ajout dans la base de donn\xE9e pour les retours
+ if($extension==$ini['explorateur']['ext']){
+ save_variable('lastexpl', 'explorateur');
+ save_variable('lastrep', $rep);
+ save_variable('rep_min', $min);
+ save_variable('retour_fiche_film', 'explorateur');
+ }
+
+ // Gestion des num\xE9ros de page
+ $META['nochannel_page']=$apge_explo.'?directory='.urlencode($rep).'&mode='.$_GET['mode'].'&page=%d';
+ if(isset($_GET['page'])){
+ $min = ($_GET['page']-1)*14;
+ }
+
$smarty->assign('AFF_CDDA',$aff_cdda=="1" && strlen($rep_copy)<=3 && (PHP_OS == "WIN32" || PHP_OS == "WINNT"));
$smarty->assign('AFF_LECTEUR',$dir_lecteur);
$smarty->assign('AFF_FAVORIS',$aff_favoris);
Modified: trunk/module/diaporama/index1.php
===================================================================
--- trunk/module/diaporama/index1.php 2007-02-23 11:42:46 UTC (rev 83)
+++ trunk/module/diaporama/index1.php 2007-02-23 21:42:19 UTC (rev 84)
@@ -10,6 +10,23 @@
$ext_ok = explode(",",$extension);
$ext = $ext_ok;
+if (isset($_GET['show_band'])) {
+ $show_band = $_GET['show_band'];
+}else{
+ $show_band = get_variable('lastshowinfo');
+ if($show_band != "non"){
+ $show_band = "oui";
+ }
+}
+
+save_variable('lastshowinfo', $show_band);
+
+if($show_band == "non"){
+ $show_band = false;
+}else{
+ $show_band = true;
+}
+
if (isset($_GET['start'])) {
$min = max($_GET['start'],0);
}else{
@@ -155,7 +172,7 @@
$smarty->assign('T_Fichier',$T_Fichier);
$smarty->assign('files',$files);
-if (isset($_GET['image'])){
+if (isset($_GET['image'])){
$aff=$_GET['image'];
}
@@ -175,8 +192,52 @@
save_variable('lastrep', $rep);
save_variable('photomin', $min);
+
+
if(isset($aff)){
+if ($_GET['start_play']=='oui') {
+ $smarty->assign('start_play','non');
+
+
+ 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);
+}else{
+ $file1 = file_get_contents("http://127.0.0.1:8081/lecteur/action.html?control=stop");
+ $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;
@@ -185,6 +246,13 @@
$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');
@@ -199,3 +267,5 @@
$smarty->assign('CONTENT',$smarty->fetch('explorateur_photo.tpl'));
$smarty->display('interface.tpl');
}
+
+?>
Modified: trunk/module/diaporama/photo.tpl
===================================================================
--- trunk/module/diaporama/photo.tpl 2007-02-23 11:42:46 UTC (rev 83)
+++ trunk/module/diaporama/photo.tpl 2007-02-23 21:42:19 UTC (rev 84)
@@ -15,19 +15,27 @@
<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>
+
+ {if $show_band}
+
<tr bgcolor="#00000000"><td width="580" height="3"><img src="transparent.gif" width="1" height="1"></td></tr>
<tr><td width="580" height="35" bgcolor="#A3B7CD3f">
- <table border="0" cellpadding="0" cellspacing="0" width="580" bgcolor="#A3B7CD3f"><tr>
- <td width="80" align="center">{if $aff >=1}<img src="{$INTERFACE_REP}btn_vert.gif" border="0"> <a href="index1.php?image={$prec}&start={$MIN}&rep={$rep_encoded}&delais={$delais}&tourne={$tourne}"><font size="1">Prec.</font></a>{else} {/if}</td>
- <td width="200" align="center"><font size="1">{if $delais==0}<form name="form1" method="get" action="index1.php">Diaporama : <input name="delais" bgcolor="{#COULEUR_TEXTBOX#}" type=text value="" size=2 maxlength=2> sec<input name=image type=hidden value="{if $aff+1 == count($files)}0{else}{$aff}{/if}"><input name=rep type=hidden value="{$REP}"><input name=tourne type=hidden value="{$tourne}"><input name=start type=hidden value="{$MIN}"></form>{else}<a href="index1.php?rep={$REP|urlencode}&start={$MIN}&image={$aff}">Arr\xE9ter le diaporama</a> ({$delais}sec){/if}</font></td>
- <td width="135" align="center"><a href="index1.php?start={$MIN}&rep={$REP|urlencode}&tosee={$aff}&force_back=1"><img src="{$INTERFACE_REP}btn_rouge.gif" border="0"><font size="1"> Expl.</font></a></td>
- <td width="40" align="center"><font size="1">{$aff+1}/{$files|@count}</font></td>
- <td width="20" align="center"><a href="index1.php?image={$aff}&start={$MIN}&rep={$REP|urlencode}&delais={$delais}&tourne={$tourne-90}"><table border="0" cellpadding="0" cellspacing="0" width="16" height="16" bgcolor="#A3B7CD3f" abgcolor="#4491CA3f"><tr height="16"><td width="16" height="16"><img src="gauche.gif" border="0" width="16" height="16"></td></tr></table></a></td>
- <td width="5" align="center"> </td>
- <td width="20" align="center"><a href="index1.php?image={$aff}&start={$MIN}&rep={$REP|urlencode}&delais={$delais}&tourne={$tourne+90}"><table border="0" cellpadding="0" cellspacing="0" width="16" height="16" bgcolor="#A3B7CD3f" abgcolor="#4491CA3f"><tr height="16"><td width="16" height="16"><img src="droite.gif" border="0" width="16" height="16"></td></tr></table></a></td>
- <td width="80" align="center">{if $aff+1 < count($files)}<img src="{$INTERFACE_REP}btn_bleu.gif" border="0"> <a focused href="index1.php?image={$next}&start={$MIN}&rep={$rep_encoded}&delais={$delais}&tourne={$tourne}"><font size="1">Suiv.</font></a>{else} {/if}</td>
- </tr></table>
+
+ <table border="0" cellpadding="0" cellspacing="0" width="580" bgcolor="#A3B7CD3f"><tr>
+ <td width="80" align="center">{if $aff >=1}<img src="{$INTERFACE_REP}btn_vert.gif" border="0"> <a href="index1.php?image={$prec}&start={$MIN}&rep={$rep_encoded}&delais={$delais}&tourne={$tourne}"><font size="1">Prec.</font></a>{else} {/if}</td>
+ <td width="187" align="center"><font size="1">{if $delais==0}<form name="form1" method="get" action="index1.php">Diapo : <input name="delais" bgcolor="{#COULEUR_TEXTBOX#}" type=text value="" size=2 maxlength=2> sec<input name=image type=hidden value="{if $aff+1 == count($files)}0{else}{$aff}{/if}"><input name=rep type=hidden value="{$REP}"><input name=tourne type=hidden value="{$tourne}"><input name=start type=hidden value="{$MIN}"></form>{else}<a href="index1.php?rep={$REP|urlencode}&start={$MIN}&image={$aff}">Arr\xE9ter le diaporama</a> ({$delais}sec){/if}</font></td>
+ <td width="135" align="center"><a href="index1.php?start={$MIN}&rep={$REP|urlencode}&tosee={$aff}&force_back=1"><img src="{$INTERFACE_REP}btn_rouge.gif" border="0"><font size="1"> Expl.</font></a></td>
+ <td width="40" align="center"><font size="1">{$aff+1}/{$files|@count}</font></td>
+ <td width="16" align="center"><a href="index1.php?image={$aff}&start={$MIN}&rep={$REP|urlencode}&delais={$delais}&tourne={$tourne-90}"><table border="0" cellpadding="0" cellspacing="0" width="16" bgcolor="#A3B7CD3f" abgcolor="#4491CA3f"><tr><td width="16"><img src="gauche.gif" border="0" width="16"></td></tr></table></a></td>
+ <td width="5" align="center"> </td>
+ <td width="16" align="center"><a href="index1.php?image={$aff}&start={$MIN}&rep={$REP|urlencode}&delais={$delais}&tourne={$tourne+90}"><table border="0" cellpadding="0" cellspacing="0" width="16" bgcolor="#A3B7CD3f" abgcolor="#4491CA3f"><tr><td width="16"><img src="droite.gif" border="0" width="16"></td></tr></table></a></td>
+ <td width="5" align="center"> </td>
+ <td width="16" align="center"><a href="index1.php?image={$aff}&start={$MIN}&rep={$REP|urlencode}&delais={$delais}&tourne={$tourne}&start_play={$start_play}"><table border="0" cellpadding="0" cellspacing="0" width="16" bgcolor="#A3B7CD3f" abgcolor="#4491CA3f"><tr><td width="16"><img src="zik.gif" border="0" width="16"></td></tr></table></a></td>
+ <td width="80" align="center">{if $aff+1 < count($files)}<img src="{$INTERFACE_REP}btn_bleu.gif" border="0"> <a focused href="index1.php?image={$next}&start={$MIN}&rep={$rep_encoded}&delais={$delais}&tourne={$tourne}"><font size="1">Suiv.</font></a>{else} {/if}</td>
+ </tr></table>
+
</td></tr>
+ {/if}
</table>
</td></tr></table>
</center>
Added: trunk/module/diaporama/zik.gif
===================================================================
(Binary files differ)
Property changes on: trunk/module/diaporama/zik.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/module/films/info.php
===================================================================
--- trunk/module/films/info.php 2007-02-23 11:42:46 UTC (rev 83)
+++ trunk/module/films/info.php 2007-02-23 21:42:19 UTC (rev 84)
@@ -147,12 +147,17 @@
$smarty->assign('chapitre',$chapitre);
}
+ if($module=='signets'){
//Signets pour ce film
$db = sqlite_open($USER.'utilisateur.db', 0666);
+
+ $mov = new ffmpeg_movie(realpath($VLC['url_current']));
+ echo $mov->getFrameCount();
$requete='SELECT * FROM signet WHERE lien="'.$signetsav[2].'" ORDER BY duree';
$result = sqlite_query($db,$requete);
$smarty->assign('SIGNETS',sqlite_fetch_all($result));
+ }
//--Fin des options
Modified: trunk/module/modules/modules.tpl
===================================================================
--- trunk/module/modules/modules.tpl 2007-02-23 11:42:46 UTC (rev 83)
+++ trunk/module/modules/modules.tpl 2007-02-23 21:42:19 UTC (rev 84)
@@ -1,3 +1,4 @@
+<br>
{if $action=="mod" OR $action=="skin"}
{section name=mod loop=$MOD start=$MIN max=4}
{if $smarty.section.mod.first}
Modified: trunk/module/mp3/jaquette.php
===================================================================
--- trunk/module/mp3/jaquette.php 2007-02-23 11:42:46 UTC (rev 83)
+++ trunk/module/mp3/jaquette.php 2007-02-23 21:42:19 UTC (rev 84)
@@ -29,29 +29,27 @@
}
if (count($fichierjpg)=="0"){
-$info=$_GET['info'];
-if($info!='' && $pagerecherche = file_get_contents('http://images.google.fr/images?q='.urlencode($info))){
-
-$ereg = 'img src=\/images\?q=(.{1,25}):\/\/(.{1,75}) width';
-preg_match_all("/$ereg/s", $pagerecherche, $valeur);
-$img='http://'.$valeur[2][rand(0,(floor(count($valeur[2])/3)))];
-
-}else{
- if ($_GET['lec'] == "webradio") {
- $img=realpath("./temp/radio.gif");
- }else{
- $img=realpath("./temp/pasdimage.gif");
- }
-}
-
- $refaire="0";
-
- if(Get_Extension_From_File($img)=="GIF"){
- $image = imagecreatefromgif($img);
- }elseif(Get_Extension_From_File($img)=="JPG"){
- $image = imagecreatefromjpeg($img);
- }
-
+ $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);
Modified: trunk/module/mp3/lecteuraudio.php
===================================================================
--- trunk/module/mp3/lecteuraudio.php 2007-02-23 11:42:46 UTC (rev 83)
+++ trunk/module/mp3/lecteuraudio.php 2007-02-23 21:42:19 UTC (rev 84)
@@ -39,6 +39,8 @@
play_fichier('type=0',$toplay,0,'mp3');
$reload='1';
+ $supplement = '?gomin=1';
+
$pagedinfo=file_get_contents('http://localhost:8081/module/mp3/lecteuraudio.html');
eval($pagedinfo);
@@ -46,6 +48,7 @@
if($morceau[3] == $toplay){
if(array_pop(explode(".", $morceau[2]))=='m3u'){
$supplement = '?toplaybis='.urlencode(realpath($_GET['url']));
+ $gotobis=true;
}
}
}
@@ -63,7 +66,7 @@
}
}
$reload='1';
-
+ $supplement = '?gomin=1';
}
if (isset($_REQUEST['control'])) {
@@ -101,6 +104,7 @@
}
$file1 = file_get_contents('http://127.0.0.1:8081/lecteur/action.html?control=seek&seek_value='.$value);
$reload='1';
+ $supplement = '?gomin=1';
}
$i=0;
@@ -128,8 +132,28 @@
}
}
}
+
if($mode=='pla'){
-$smarty->assign('min',$_GET['min']);
+(isset($_GET['min'])?$min=$_GET['min']:$min=0);
+
+if(isset($_GET['gomin']) OR isset($_GET['toplay'])){
+ foreach($pl_transformed as $key => $el){
+ if($el[1]){
+ $current = $key;
+ }
+ }
+ $min=floor(($key+1)/16)*16;
+}
+
+if(isset($_GET['toplay'])){
+ $min=floor(($_GET['num'])/16)*16;
+}
+
+if($gotobis){
+ $min=floor(count($pl_transformed)/16)*16;
+}
+
+$smarty->assign('min',$min);
}elseif($mode=='bib'){
(isset($_GET['t'])?$type=$_GET['t']:$type='ar');
(isset($_GET['l'])?$letter=$_GET['l']:$letter='');
Modified: trunk/module/mp3/playdb.php
===================================================================
--- trunk/module/mp3/playdb.php 2007-02-23 11:42:46 UTC (rev 83)
+++ trunk/module/mp3/playdb.php 2007-02-23 21:42:19 UTC (rev 84)
@@ -10,9 +10,6 @@
$db = sqlite_open($USER.'audio.db', 0666);
-// On teste si la base des fichiers mp3/ogg existe bien
-if (sqlite_table_exists($db, 'music')) {
-
$ext_audio = $ini['explorateur']['ext_audio'];
$audio_defaut = $ini['explorateur']['audio_defaut'];
$afficher_fichier_cache = $ini['explorateur']['afficher_fichier_cache'];
@@ -159,7 +156,6 @@
save_variable('num_playlist', get_variable('num_playlist')+1);
}
-}
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<html>
Modified: trunk/module/mp3/playlist_audio.tpl
===================================================================
--- trunk/module/mp3/playlist_audio.tpl 2007-02-23 11:42:46 UTC (rev 83)
+++ trunk/module/mp3/playlist_audio.tpl 2007-02-23 21:42:19 UTC (rev 84)
@@ -46,12 +46,13 @@
{assign var=temp value=$min-16}
{attribbouton touche="green" lien="lecteuraudio.php?min=$temp"}
{/if}
-
+
+ {counter name=indice print=false start=$min}
{section name=playlist loop=$pl start=$min max=16}
- <font size="1">{counter name=indice print=true start=$min}. </font>
+ <font size="1">{counter name=indice print=true assign=boucle}. </font>
<font size="1">
{if $pl[playlist].1}<u>{/if}
- <a href=lecteuraudio.php?toplay={$pl[playlist].3}&url={$pl[playlist].2|urlencode}>{$pl[playlist].0|truncate:130:''|strip_delimiters}</a>
+ <a href=lecteuraudio.php?num={$boucle}&toplay={$pl[playlist].3}&url={$pl[playlist].2|urlencode}>{$pl[playlist].0|truncate:130:''|strip_delimiters}</a>
{if $pl[playlist].1}</u>{/if}
</font><br>
{/section}
Modified: trunk/module/rss/index1.php
===================================================================
--- trunk/module/rss/index1.php 2007-02-23 11:42:46 UTC (rev 83)
+++ trunk/module/rss/index1.php 2007-02-23 21:42:19 UTC (rev 84)
@@ -2,58 +2,49 @@
$RACINE_REP = "../../";
require($RACINE_REP.'_framework/framework.php');
+(isset($_REQUEST['cat'])?$cat=$_REQUEST['cat']:$cat=2);
+$smarty->assign('cat',$cat);
+(isset($_REQUEST['min'])?$min=$_REQUEST['min']:$min=0);
+$smarty->assign('MIN',$min);
+$db = sqlite_open($USER.'rss.db', 0666);
+$result = sqlite_query($db,'SELECT * FROM cat ORDER BY name');
+$categories = sqlite_fetch_all($result);
-if (isset($_REQUEST['url'])) {
- $url=$_REQUEST['url'];
-}else{
- $url='';
+foreach($categories as $c){
+ if($c['id']==$cat){
+ $cat = $c;
+ }
+ $MENU_ALT[]=array('lien'=>'index1.php?cat='.$c['id'], 'nom'=>$c['name'], 'selected'=>$cat==$c['id']);
}
-$smarty->assign('url',$url);
+if(isset($_REQUEST['feed'])){
+ $feed=$_REQUEST['feed'];
+}
-if ($url==""){
-
- $db = sqlite_open('../../_utilisateur/rss.db', 0666);
- $requete='SELECT * FROM cat ORDER BY name';
- $result = sqlite_query($db,$requete);
- $resultsave = sqlite_query($db,$requete);
- $index=0;
-
- $lenght=sqlite_num_rows($result);
-
- while ($row = sqlite_fetch_array($result)) {
+if(!isset($feed)){
- $requete2="SELECT * FROM feeds WHERE cat = '".$row[name]."'";
- $result2 = sqlite_query($db,$requete2);
-
- $RSS[$row[name]]=array();
-
- while ($row2 = sqlite_fetch_array($result2)) {
- $RSS[$row[name]][]=array('url'=>$row2[add],'name'=>$row2[name]);
- }
-
- }
-
- sqlite_close($db);
-
-$LINK['red']= page_retour_menu();
-
-$smarty->assign('RSS',$RSS);
-$smarty->assign('TITRE','Flux RSS');
-$smarty->assign('CONTENT',$smarty->fetch('rss.tpl'));
-$smarty->display('interface.tpl');
+ $LINK['red']= page_retour_menu();
+
+ $result = sqlite_query($db,'SELECT * FROM feeds WHERE cat="'.$cat['id'].'" ORDER BY name');
+
+ $smarty->assign('RSS',sqlite_fetch_all($result));
+ $smarty->assign('TITRE','Flux RSS : '.$cat['name']);
+ $smarty->assign('CONTENT',$smarty->fetch('rss.tpl'));
+ $smarty->display('interface.tpl');
}else{
- $LINK['red']= 'index1.php';
-
- $url=urldecode($url);
- $xml = simplexml_load_file($url);
+ $LINK['red']= 'index1.php?cat='.$cat['id'];
+ $result = sqlite_query($db,'SELECT * FROM feeds WHERE cat="'.$cat.'" AND id="'.$feed.'" limit 1');
+ $url = sqlite_fetch_array($result);
+
+ $xml = simplexml_load_file($url['add']);
+
if($xml->channel->image->url!="")
-$FLUX['image']=$xml->channel->image->url;
-$FLUX['titre']=utf8_decode($xml->channel->title);
+ $FLUX['image']=$xml->channel->image->url;
+ $FLUX['titre']=utf8_decode($xml->channel->title);
foreach($xml->channel->item as $post){
if($post->title!=''){
@@ -61,8 +52,11 @@
}
}
+$smarty->assign('feed',$feed);
$smarty->assign('FLUX',$FLUX);
-$smarty->display('rss.tpl');
+$smarty->display('rss.tpl');
}
+
+sqlite_close($db);
?>
Modified: trunk/module/rss/rss.tpl
===================================================================
--- trunk/module/rss/rss.tpl 2007-02-23 11:42:46 UTC (rev 83)
+++ trunk/module/rss/rss.tpl 2007-02-23 21:42:19 UTC (rev 84)
@@ -1,22 +1,42 @@
{if $url==''}
- <table width="600" border="0" cellpadding="0" cellspacing="0" align="center" valign="top"><tr><td width="300" align="center" valign="top">
+ {section name=liste loop=$RSS max=8 start=$MIN}
+ {if $smarty.section.liste.first}
+ {if $MIN!=0}
+ {assign var=temp value=$MIN-8}
+ {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="7" cellpadding="7" align="left" valign="top"><tr><td>
+ <table width="250" border="0" cellspacing="5" cellpadding="0" align="left" valign="top">
+ {/if}
+
+
+ <tr><td><a href="index1.php?cat={$cat}&feed={$RSS[liste].id}">
+ <table width="240" border="0" cellpadding="0" cellspacing="0" bgcolor="#COULEUR_FOND1#" abgcolor="{#COULEUR_ALINK#}">
+ <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="110"><b><u>{$RSS[liste].name}</u></b></td>
+ </tr>
+ </table>
+ </a></td></tr>
+
+ {if $smarty.section.liste.iteration == 4}
+ </table><table width="250" border="0" cellspacing="5" cellpadding="0" align="left" valign="top">
+ {/if}
+
+ {if $smarty.section.liste.last}
+ </table></td></tr></table>
+ {if $MIN+$smarty.section.liste.total < count($RSS)}
+ {assign var=temp value=$MIN+8}
+ {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}
- {foreach name=cat item=cat from=$RSS key=key}
- {counter assign=count}
- {if $count == count($RSS)/2+1}
- </td><td width="300" align="center" valign="top">
- {/if}
-
- <u>{$key}</u><br>
-
- {foreach name=flux item=flux from=$cat key=key2}
- <a href="index1.php?url={$flux.url|urlencode}">{$flux.name}</a><br>
- {/foreach}
-
- <br>
- {/foreach}
-
- </td></tr></table>
{else}
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<html>
Modified: trunk/module/signet/index1.php
===================================================================
--- trunk/module/signet/index1.php 2007-02-23 11:42:46 UTC (rev 83)
+++ trunk/module/signet/index1.php 2007-02-23 21:42:19 UTC (rev 84)
@@ -20,7 +20,9 @@
$requete='SELECT * FROM signet ORDER BY lien, duree';
$result = sqlite_query($db,$requete);
-
+
+sqlite_close($db);
+
$smarty->assign('TITRE','Signets');
$smarty->assign('MIN',$min);
$smarty->assign('CONTENT_TABLE',sqlite_fetch_all($result));
Modified: trunk/skin/simple/framework_skin.php
===================================================================
--- trunk/skin/simple/framework_skin.php 2007-02-23 11:42:46 UTC (rev 83)
+++ trunk/skin/simple/framework_skin.php 2007-02-23 21:42:19 UTC (rev 84)
@@ -25,21 +25,21 @@
}
$smarty->assign('BACKGROUND_REP',$BACKGROUND_REP);
-
// Fond d'\xE9cran par d\xE9faut - path d\xE9finit \xE0 partir du r\xE9pertoire /http/skin/simple/
$BACKGROUND = $_COULEUR['BACKGROUND'];
// Fonction responsable de l'affichage du fond d'\xE9cran \xE0 la toute fin du processus de conception de la page (post-filtre de smarty)
function background($output, &$smarty){
- global $contenu_html, $BACKGROUND, $BACKGROUND_REP, $SKIN_REP, $BACKGROUND_TYPE, $FORCED, $_SERVER, $BACK_DONE;
+ global $contenu_html, $BACKGROUND, $BACKGROUND_REP, $SKIN_REP, $BACKGROUND_TYPE, $FORCED, $_SERVER, $BACK_DONE, $smarty;
if(((eregi("stop",$contenu_html) AND $BACKGROUND!="none" AND realpath($BACKGROUND_REP.$BACKGROUND)!='') OR $FORCED) AND !$BACK_DONE){
- if($BACKGROUND_TYPE == 'add'){
+ if($BACKGROUND_TYPE == 'add'){
play_fichier('type=21&temps=8000',realpath($BACKGROUND_REP.$BACKGROUND),1,'photo');
}else{
play_fichier('type=20&temps=8000',realpath($BACKGROUND_REP.$BACKGROUND),1,'photo');
}
//Pour ne pas lancer deux fois le background
$BACK_DONE = 1;
+
}
return($output);
}
Deleted: trunk/skin/simple/option.tpl
===================================================================
--- trunk/skin/simple/option.tpl 2007-02-23 11:42:46 UTC (rev 83)
+++ trunk/skin/simple/option.tpl 2007-02-23 21:42:19 UTC (rev 84)
@@ -1,151 +0,0 @@
-<!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 border="0" cellpadding="0" cellspacing="0" width="560"><tr>
- <td width="560" height="433" border="0" cellpadding="0" cellspacing="0" align="left" valign=top bgcolor="{#COULEUR_FOND_RADIO#}">
- <center><table width="560" height="25" border="0" align="center" cellpadding="0" cellspacing="0">
- <tr>
- <td width="104" align=center><a href="options.php?module=infos" {if $module=='infos'}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">Infos</td></tr></table></a></td>
- <td width="104" align=center><a href="options.php?module=video" {if $module=='video'}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">Video</td></tr></table></a></td>
- <td width="104" align=center><a href="options.php?module=audio" {if $module=='audio'}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">Audio</td></tr></table></a></td>
- <td width="104" align=center><a href="options.php?module=sstitre" {if $module=='sstitre'}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">Sous-titres</td></tr></table></a></td>
- <td width="104" align=center><a href="options.php?module=navigation" {if $module=='navigation'}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">Chapitres</td></tr></table></a></td>
- </tr>
- </table></center>
-
-
-{if $module=='infos'}
- {$content}
-{elseif $module=='video'}
-<font size="3"><u>Options vid\xE9o</u></font><br>
- <form action="options.php" method="get">
- <input type=hidden name=module value=video><input type=hidden name=var value="video-es"><br>
- {foreach from=$video item=pistev key=key name=video}
- <input type=radio name=video bgcolor="{#COULEUR_FOND_RADIO#}" value="{$key}" {if $pistev.1} checked{/if}>{$pistev.0}<br>
- {/foreach}
- <br>Post-traitement
- <table>
- <tr>
- <td><input type="radio" name="pp" bgcolor="{#COULEUR_FOND_RADIO#}" value="0" {if $pp_video.0} checked{/if}></td>
- <td><input type="radio" name="pp" bgcolor="{#COULEUR_FOND_RADIO#}" value="1" {if $pp_video.1} checked{/if}></td>
- <td><input type="radio" name="pp" bgcolor="{#COULEUR_FOND_RADIO#}" value="2" {if $pp_video.2} checked{/if}></td>
- <td><input type="radio" name="pp" bgcolor="{#COULEUR_FOND_RADIO#}" value="3" {if $pp_video.3} checked{/if}></td>
- <td><input type="radio" name="pp" bgcolor="{#COULEUR_FOND_RADIO#}" value="4" {if $pp_video.4} checked{/if}></td>
- <td><input type="radio" name="pp" bgcolor="{#COULEUR_FOND_RADIO#}" value="5" {if $pp_video.5} checked{/if}></td>
- <td><input type="radio" name="pp" bgcolor="{#COULEUR_FOND_RADIO#}" value="6" {if $pp_video.6} checked{/if}></td>
- </tr>
- <tr>
- <td>0</td><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td></tr>
- </table>
- Augmenter la qualit\xE9 du traitement de l'image (de 0 vers 6) demande plus de puissance CPU.
- <br>
-
-<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>
-
-<table width="250" 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=100 grad=5></td></tr>
-</table>
-
-<input bgcolor="{#COULEUR_TEXTBOX#}" type=submit value="Valider les modifications">
-</form>
-
-{elseif $module=='audio'}
-<font size="3"><u>Options audio</u></font><br>
- <form action="options.php" method="get"><input type=hidden name=module value=audio><input type=hidden name=var value="audio-es"><br>
- {foreach from=$audio item=pistea key=key name=audio}
- <input type=radio name=audio bgcolor="{#COULEUR_FOND_RADIO#}" value="{$key}" {if $pistea.1} checked{/if}>{$pistea.0}<br>
- {/foreach}
- <br><form action="none">
- <input type="radio" name="aud" value="69(en,mp2)" bgcolor="{#COULEUR_FOND_RADIO#}"> Son st\xE9r\xE9o<br>
- <input type="radio" name="aud" value="69(en,ac3)" bgcolor="{#COULEUR_FOND_RADIO#}"> Dolby Digital (S/PDIF)<br>
- <br><input bgcolor="{#COULEUR_TEXTBOX#}" type=submit value="Valider les modifications"></form>
-
-{elseif $module=='sstitre'}
-<font size="3"><u>Sous-titres</u></font><br>
- <form action="options.php" method="get"><input type=hidden name=module value=sstitre><br>
- {foreach from=$sstitre item=pistess key=key name=sstitre}
- <input type=radio name=sstitre bgcolor="{#COULEUR_FOND_RADIO#}" value="{$key}"{if $pistess.1} checked{/if}>{$pistess.0}<br>
- {/foreach}
-
- <table width="560" border="1" cellpadding="1" cellspacing="0" align="left">
- <tr><td align="left">
- Les param\xE8tres suivants ne seront pris en compte qu'apr\xE8s le red\xE9marage du films. Ils seront sauvegard\xE9s dans Easybox pour les prochaines utilisations de easybox<br />
- <font size="3"><u>Position :</u></font>
- <input type=text bgcolor="{#COULEUR_FOND_RADIO#}" name="sub_margin" size=3 maxlength=3 value="{$sub_margin}"><br>
- <font size="3"><u>Aspect</u></font>
-
- <table width="300" border="1" cellpadding="1" cellspacing="0" align="left">
- <tr><td>Couleur</td><td>Taille</td></tr>
- <tr><td>
- <input bgcolor="{#COULEUR_FOND_RADIO#}" type=radio name='fontcolor' value="16777215"{if $fontcolor=='16777215'} checked{/if}> <font color="#FFFFFF"><b>Blanc</b></font>
- </td>
- <td>
- <input bgcolor="{#COULEUR_FOND_RADIO#}" type=radio name='fontsize' value="12"{if $ffontsize=='12'} checked{/if}> Plus petit
- </td></tr>
- <tr><td>
- <input bgcolor="{#COULEUR_FOND_RADIO#}" type=radio name='fontcolor' value="16776960"{if $fontcolor=='16776960'} checked{/if}> <font color="#FFFF00"><b>Jaune</b></font>
- </td>
- <td>
- <input bgcolor="{#COULEUR_FOND_RADIO#}" type=radio name='fontsize' value="24"{if $ffontsize=='24'} checked{/if}> Petit
- </td></tr>
- <tr><td>
- <input bgcolor="{#COULEUR_FOND_RADIO#}" type=radio name='fontcolor' value="65535"{if $fontcolor=='65535'} checked{/if}> <b><font color="#00CCFF">Cyan</font></b>
- </td>
- <td>
- <input bgcolor="{#COULEUR_FOND_RADIO#}" type=radio name='fontsize' value="32"{if $ffontsize=='32'} checked{/if}> Normal
- </td></tr>
- <tr><td>
- <input bgcolor="{#COULEUR_FOND_RADIO#}" type=radio name='fontcolor' value="16711680"{if $fontcolor=='16711680'} checked{/if}> <b><font color="#FF0000">Rouge</font></b>
- </td>
- <td>
- <input bgcolor="{#COULEUR_FOND_RADIO#}" type=radio name='fontsize' value="36"{if $ffontsize=='36'} checked{/if}> Grand
- </td></tr>
- <tr><td>
- <input bgcolor="{#COULEUR_FOND_RADIO#}" type=radio name='fontcolor' value="32768"{if $fontcolor=='32768'} checked{/if}> <b><font color="#00FF00">Vert</font></b>
- </td>
- <td>
- <input bgcolor="{#COULEUR_FOND_RADIO#}" type=radio name='fontsize' value="40"{if $ffontsize=='40'} checked{/if}> Plus grand
- </td></tr>
- </table>
- </td></tr></table>
- <input bgcolor="{#COULEUR_TEXTBOX#}" type=submit value="Valider les modifications"></form>
-
-{elseif $module=='navigation'}
-
-<font size="3"><u>Chapitres</u></font><br>
-
- <table><tr><td>
-
-{assign var=keyb value=1}
-
- {foreach from=$chapitre item=chap key=key name=chap}
- <a href="options.php?module=navigation&chap={$key}">{if $chap.1}<font family="Symbol">T</font>{/if}<font size="1">{$chap.0}</font></a><br>
- {assign var=keyb value=$keyb+1}
- {if $keyb is div by 17}</td><td>{/if}
- {/foreach}
-
- </td></tr></table>
-
-{/if}
-
-
- </td>
-</tr></table>
-</center>
-<script language="javascript" src="/fb2ie.js">
-</script>
-</body>
-</html>
Modified: trunk/skin/simplegreen/couleur.conf
===================================================================
--- trunk/skin/simplegreen/couleur.conf 2007-02-23 11:42:46 UTC (rev 83)
+++ trunk/skin/simplegreen/couleur.conf 2007-02-23 21:42:19 UTC (rev 84)
@@ -67,7 +67,7 @@
COULEUR_FOND_AVERTISSEMENT = "#B7D88B3F"
#///////////////////////////////// Fond d'\xE9cran ///////////////////////////////////
-BACKGROUND = "background.png"
-TYPE = "ext"
+BACKGROUND = "background.jpg"
+TYPE = "int"
?>
Modified: trunk/skin/simplegreen/interface/barre1.gif
===================================================================
(Binary files differ)
Modified: trunk/skin/simplegreen/interface/barre2.gif
===================================================================
(Binary files differ)
Modified: trunk/skin/simplegreen/interface/barre3.gif
===================================================================
(Binary files differ)
Modified: trunk/skin/simplegreen/interface/player.gif
===================================================================
(Binary files differ)
Modified: trunk/skin/simplegreen/interface.tpl
===================================================================
--- trunk/skin/simplegreen/interface.tpl 2007-02-23 11:42:46 UTC (rev 83)
+++ trunk/skin/simplegreen/interface.tpl 2007-02-23 21:42:19 UTC (rev 84)
@@ -50,12 +50,12 @@
<tr>
<td align="center" valign="top">
{eval var=$CONTENT}
-<a onFocus='service="ts://127.0.0.1?ox=20&oy=20&ow=720&oh=576,&ix=0&iy=0&iw=360&ih=192";'>1-1</a>
-<a onFocus='service="ts://127.0.0.1?ox=20&oy=20&ow=720&oh=576,&ix=360&iy=0&iw=360&ih=192";'>1-2</a>
-<a onFocus='service="ts://127.0.0.1?ox=20&oy=20&ow=720&oh=576,&ix=0&iy=192&iw=360&ih=192";'>2-1</a>
-<a onFocus='service="ts://127.0.0.1?ox=20&oy=20&ow=720&oh=576,&ix=360&iy=192&iw=360&ih=192";'>2-2</a>
-<a onFocus='service="ts://127.0.0.1?ox=20&oy=20&ow=720&oh=576,&ix=0&iy=384&iw=360&ih=192";'>3-1</a>
-<a onFocus='service="ts://127.0.0.1?ox=20&oy=20&ow=720&oh=576,&ix=360&iy=384&iw=360&ih=192";'>3-2</a>
+<a onFocus='service="ts://127.0.0.1?ox=0&oy=0&ow=720&oh=576,&ix=0&iy=0&iw=360&ih=192";'>1-1</a>
+<a onFocus='service="ts://127.0.0.1?ox=0&oy=0&ow=720&oh=576,&ix=361&iy=0&iw=360&ih=192";'>1-2</a>
+<a onFocus='service="ts://127.0.0.1?ox=0&oy=0&ow=720&oh=576,&ix=0&iy=193&iw=360&ih=192";'>2-1</a>
+<a onFocus='service="ts://127.0.0.1?ox=0&oy=0&ow=720&oh=576,&ix=361&iy=193&iw=360&ih=192";'>2-2</a>
+<a onFocus='service="ts://127.0.0.1?ox=0&oy=0&ow=720&oh=576,&ix=0&iy=385&iw=360&ih=192";'>3-1</a>
+<a onFocus='service="ts://127.0.0.1?ox=0&oy=0&ow=720&oh=576,&ix=361&iy=385&iw=360&ih=192";'>3-2</a>
</td>
</tr>
</table>
Deleted: trunk/skin/simplegreen/option.tpl
===================================================================
--- trunk/skin/simplegreen/option.tpl 2007-02-23 11:42:46 UTC (rev 83)
+++ trunk/skin/simplegreen/option.tpl 2007-02-23 21:42:19 UTC (rev 84)
@@ -1,152 +0,0 @@
-<!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 border="0" cellpadding="0" cellspacing="0" width="560"><tr>
- <td width="560" height="433" border="0" cellpadding="0" cellspacing="0" align="left" valign=top bgcolor="{#COULEUR_FOND_RADIO#}">
- <center><table width="560" height="25" border="0" align="center" cellpadding="0" cellspacing="0">
- <tr>
- <td width="104" align=center><a href="options.php?module=infos" {if $module=='infos'}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">Infos</td></tr></table></a></td>
- <td width="104" align=center><a href="options.php?module=video" {if $module=='video'}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">Video</td></tr></table></a></td>
- <td width="104" align=center><a href="options.php?module=audio" {if $module=='audio'}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">Audio</td></tr></table></a></td>
- <td width="104" align=center><a href="options.php?module=sstitre" {if $module=='sstitre'}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">Sous-titres</td></tr></table></a></td>
- <td width="104" align=center><a href="options.php?module=navigation" {if $module=='navigatio...
[truncated message content] |
