Menu
▾
▴
[Easybox-mod-developers] SF.net SVN: easybox-mod: [63] trunk
|
From: <ara...@us...> - 2007-01-06 11:42:51
|
Revision: 63
http://svn.sourceforge.net/easybox-mod/?rev=63&view=rev
Author: aragornis
Date: 2007-01-06 03:42:46 -0800 (Sat, 06 Jan 2007)
Log Message:
-----------
Suppression d'un bug sur la nouvelle barre d'avance
Ajout du classement par id dans le catalogue vid?\195?\169o
Remise en fonction du fond d'?\195?\169cran sur freebox v4
Mise ?\195?\160 jour des scanners pour faire des scans p?\195?\169riodiques des vid?\195?\169os avec recherche r?\195?\169guli?\195?\168re et mise ?\195?\160 jour r?\195?\169guli?\195?\168re des fiches film et acteurs
Mise ?\195?\160 jour des librairies de r?\195?\169cup?\195?\169ration d'infos sur allocine
Modified Paths:
--------------
trunk/_framework/fonctions_partagees.inc.php
trunk/_framework/lib/get_info.php
trunk/configuration/bases.xml
trunk/configuration/configajout.php
trunk/configuration/configliste.php
trunk/configuration/configmodif.php
trunk/configuration/scan_amc.php
trunk/configuration/scan_video.php
trunk/http-vlc/lecteur/play-low.html
trunk/http-vlc/lecteur/play-wifi.html
trunk/http-vlc/lecteur/play.html
trunk/module/films/catalogue.php
trunk/module/films/catalogue_video.tpl
trunk/module/films/films.tpl
Modified: trunk/_framework/fonctions_partagees.inc.php
===================================================================
--- trunk/_framework/fonctions_partagees.inc.php 2006-12-21 15:41:32 UTC (rev 62)
+++ trunk/_framework/fonctions_partagees.inc.php 2007-01-06 11:42:46 UTC (rev 63)
@@ -54,6 +54,34 @@
RETURN($result[0]['value']);
}
+//Programmer une action cron
+function save_cron($timestamp, $exec){
+global $USER;
+ $db = sqlite_open($USER.'utilisateur.db', 0666);
+ sqlite_query($db,'INSERT INTO cron VALUES("","'.$timestamp.'",\''.sqlite_escape_string($exec).'\')');
+ sqlite_close($db);
+}
+
+//R\xE9cup\xE8re les crons \xE0 executer
+function get_cron(){
+global $USER;
+ $db = sqlite_open($USER.'utilisateur.db', 0666);
+ $query = sqlite_query($db,'SELECT * FROM cron WHERE timestamp<='.time());
+ $result = sqlite_fetch_all($query, SQLITE_ASSOC);
+ sqlite_close($db);
+ RETURN($result[0]['value']);
+}
+
+//Supprime une action du cron
+function del_cron($var){
+global $USER;
+ $db = sqlite_open($USER.'utilisateur.db', 0666);
+ $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']);
+}
+
//Supprime les variables de session
function clean_vars(){
global $USER;
@@ -200,6 +228,7 @@
$obj = null;
}
}
+ print_r($lect);
RETURN($lect);
}
Modified: trunk/_framework/lib/get_info.php
===================================================================
--- trunk/_framework/lib/get_info.php 2006-12-21 15:41:32 UTC (rev 62)
+++ trunk/_framework/lib/get_info.php 2007-01-06 11:42:46 UTC (rev 63)
@@ -242,24 +242,44 @@
$res['nom'] = $valeur[1];
//R\xE9cup\xE9ration de la date de naissance
- $ereg = '<h4><div style="padding:10 0 0 0">(.{1,100})<\/h4><\/div><div style="padding:15 0 0 0">';
+ $ereg = '<h4><div style="padding:10 0 0 0">(.{1,200})<\/h4><\/div><div style="padding:15 0 0 0">';
preg_match("/$ereg/s", $acteurrecherche, $valeur);
+ $searchstring = $valeur[1];
- $expl=explode(" ",trim($valeur[1]));
- foreach($expl as $exp){
- $new.=trim($exp).' ';
- }
-
- $ereg = 'N\xE9 le (.{1,18}) \xE0 (.{1,150})<br \/>';
- preg_match("/$ereg/s", trim($new), $valeur);
+ $ereg = 'N\xE9e? ((le|en) (.{1,18}))? \xE0 (.{1,150})';
+ $found = preg_match("/$ereg/s", trim($searchstring), $valeur);
+ if(!$found){
+ $ereg = 'N\xE9e? (le|en) (.{1,18})';
+ preg_match("/$ereg/s", trim($searchstring), $valeur);
+ $valeur[4] = '';
+ $valeur[3] = strip_tags($valeur[2]);
+ }
+
+ //Activer pour debug
+ //file_put_contents('debug.txt', file_get_contents('debug.txt')."\n".' '.$valeur[0].' '.$res['nom']);
+
$monthes = array('Janvier'=>'1', 'F\xE9vrier'=>'2', 'Mars'=>'3', 'Avril'=>'4', 'Mai'=>'5', 'Juin'=>'6', 'Juillet'=>'7','Ao\xFBt'=>'8', 'Septembre'=>'9', 'Octobre'=>'10', 'Novembre'=>'11', 'D\xE9cembre'=>'12');
- $expl=explode(" ",trim($valeur[1]));
- if(count($expl)==3)
+ $expl=explode(" ",trim($valeur[3]));
+ if(count($expl)==3){
$res['date_naissance'] = mktime(0,0,0,$monthes[$expl[1]],$expl[0],$expl[2]);
- else
+ }elseif(count($expl)==1){
+ $res['date_naissance'] = mktime(0,0,0,1,1,$expl[0]);
+ }else{
$res['date_naissance'] = 2;
- $res['lieu_naissance'] = $valeur[2];
-
+ }
+
+ // On ne garde que le d\xE9but de ce qui a \xE9t\xE9 extrait. On supprime la partie apr\xE8s le retour \xE0 la ligne possible avec deux tags diff\xE9rents
+ //(merci pour la coh\xE9rence du code chez allocin\xE9 !)
+ $pos = stripos($valeur[4], '<br>');
+ $pos2 = stripos($valeur[4], '<br />');
+ if(($pos===false) AND ($pos2===false)){
+ $res['lieu_naissance'] = $valeur[4];
+ }elseif(($pos===false) OR ($pos2===false)){
+ $res['lieu_naissance'] = substr($valeur[4], 0, max($pos,$pos2));
+ }else{
+ $res['lieu_naissance'] = substr($valeur[4], 0, min($pos,$pos2));
+ }
+
// Photo de la personnalit\xE9
$ereg = '<td valign="top" style="padding:0 10 10 0" width="120"><img src="(.{1,200})" width="120" height="160" border="0">';
preg_match("/$ereg/s", $acteurrecherche, $valeur);
@@ -274,9 +294,14 @@
$ereg = '<div><h4><b>(.{1,250})<h4><div style="padding:10 0 0 0">';
preg_match("/$ereg/s", $acteurrecherche, $valeur);
$res['statut'] = trim(strip_tags($valeur[1]));
+
+ if(empty($res['statut'])){
+ $ereg = '<div><h4><b>(.{1,250})<\/b><\/h4><\/div><h4>';
+ preg_match("/$ereg/s", $acteurrecherche, $valeur);
+ $res['statut'] = trim(strip_tags($valeur[1]));
+ }
-
RETURN $res;
}else{
RETURN 'erreur';
Modified: trunk/configuration/bases.xml
===================================================================
--- trunk/configuration/bases.xml 2006-12-21 15:41:32 UTC (rev 62)
+++ trunk/configuration/bases.xml 2007-01-06 11:42:46 UTC (rev 63)
@@ -5,11 +5,11 @@
<nom>video.db</nom>
<table>
<name>film</name>
- <syntax>CREATE TABLE film ( id INTEGER NOT NULL PRIMARY KEY DEFAULT "0" , name TEXT , dir TEXT , Synopsis TEXT , img TEXT , sortie INT , realisateur TEXT , avec TEXT , film TEXT , genre TEXT , Duree TEXT , production TEXT , critique_visiteurs TEXT , critique_presse TEXT , ba TEXT )</syntax>
+ <syntax>CREATE TABLE film ( id INTEGER NOT NULL PRIMARY KEY DEFAULT "0" , name TEXT , dir TEXT , Synopsis TEXT , img TEXT , sortie INT , realisateur TEXT , avec TEXT , film TEXT , genre TEXT , Duree TEXT , production TEXT , critique_visiteurs TEXT , critique_presse TEXT , ba TEXT , auto INTEGER , last_update INTEGER)</syntax>
</table>
<table>
<name>celebrite</name>
- <syntax>CREATE TABLE celebrite ( id INTEGER NOT NULL PRIMARY KEY DEFAULT "0" , nom TEXT , date_naissance INT , lieu_naissance TEXT , img TEXT , bio INT , statut TEXT )</syntax>
+ <syntax>CREATE TABLE celebrite ( id INTEGER NOT NULL PRIMARY KEY DEFAULT "0" , nom TEXT , date_naissance INT , lieu_naissance TEXT , img TEXT , bio INT , statut TEXT , last_update INTEGER)</syntax>
</table>
</base>
Modified: trunk/configuration/configajout.php
===================================================================
--- trunk/configuration/configajout.php 2006-12-21 15:41:32 UTC (rev 62)
+++ trunk/configuration/configajout.php 2007-01-06 11:42:46 UTC (rev 63)
@@ -1,34 +1,10 @@
<?
$db = sqlite_open('../_utilisateur/video.db', 0666);
-if(!@sqlite_query($db,"SELECT id FROM film")){
- $requete='SELECT * from film ORDER BY name asc';
- $result = sqlite_query($db,$requete);
- sqlite_query($db,'DROP TABLE film;');
- sqlite_query($db,'CREATE TABLE film ( id INTEGER NOT NULL PRIMARY KEY DEFAULT "0" , name TEXT , dir TEXT , Synopsis TEXT , img TEXT , sortie TEXT , realisateur TEXT , avec TEXT , film TEXT , genre TEXT , Duree TEXT , production TEXT );');
- while ($row = sqlite_fetch_array($result)) {
- sqlite_query($db,'INSERT INTO film VALUES (NULL,\''.sqlite_escape_string($row[name]).'\',\''.sqlite_escape_string($row[dir]).'\',\''.sqlite_escape_string($row[Synopsis]).'\',\''.sqlite_escape_string($row[img]).'\',\''.sqlite_escape_string($row[sortie]).'\',\''.sqlite_escape_string($row[realisateur]).'\',\''.sqlite_escape_string($row[avec]).'\',\''.sqlite_escape_string($row[film]).'\',\''.sqlite_escape_string($row[genre]).'\',\''.sqlite_escape_string($row[Duree]).'\',\''.sqlite_escape_string($row[production]).'\');');
- }
-}
-if (!sqlite_table_exists($db, "film")){
- sqlite_query($db,
- 'CREATE TABLE film (
- id INTEGER NOT NULL PRIMARY KEY DEFAULT "0" ,
- name TEXT , dir TEXT ,
- Synopsis TEXT ,
- img TEXT ,
- sortie TEXT ,
- realisateur TEXT ,
- avec TEXT ,
- film TEXT ,
- genre TEXT ,
- Duree TEXT ,
- production TEXT
- ) ; ');
-}
if($_GET['supid']!=""){
sqlite_query($db,'DELETE FROM film WHERE ROWID = '.$_GET['supid'].'');
}
+
echo'
<center><H1>Gestion de la base de donn\xE9es des films</H1><br><a href="index1.php">Retour \xE0 la configuration</a> - <a href="index1.php?page=53">Retour \xE0 la liste</a></center><br><br>
<center><table widht="800" cellspacing="0" cellpadding="0"><tr><td align=center>';
@@ -49,7 +25,9 @@
\''.sqlite_escape_string($_REQUEST['production']).'\',
\''.sqlite_escape_string($_REQUEST['notevis']).'\',
\''.sqlite_escape_string($_REQUEST['notecri']).'\',
- \'\')';
+ \'\',
+ \''.sqlite_escape_string($_REQUEST['auto']).'\',
+ \'0\')';
$result = sqlite_query($db,$requete);
echo 'votre film a bien \xE9t\xE9 ajout\xE9.<br>
<a href="index1.php?page=54">En ajout\xE9 un autre.</a><br>
@@ -96,7 +74,9 @@
<br><u>Synopsis</u><br>
<textarea rows="5" cols="60" name="Synopsis" style="border: thin outset;font-size: 12px;"></textarea><br>
<br><u>Url de l\'image</u><br>
- <textarea rows="2" cols="60" name="img" style="border: thin outset;font-size: 12px;"></textarea><br><br>
+ <textarea rows="2" cols="60" name="img" style="border: thin outset;font-size: 12px;"></textarea><br>
+ <input type="checkbox" name="auto" value="1">Cochez cette case si vous ne voulez pas qu\'Easybox r\xE9cup\xE8re automatiquement des informations pour ce film et \xE9crase les donn\xE9es fournies
+ <br><br>
<input type="submit" style="border: thin outset;font-size: 9px;" value="Ajouter la fiche du film">
</form><br><br>';
echo'</td></tr></table></center>';
Modified: trunk/configuration/configliste.php
===================================================================
--- trunk/configuration/configliste.php 2006-12-21 15:41:32 UTC (rev 62)
+++ trunk/configuration/configliste.php 2007-01-06 11:42:46 UTC (rev 63)
@@ -14,35 +14,10 @@
delete_all();
}
-
-if (!sqlite_table_exists($db, "film")){
- sqlite_query($db,
- 'CREATE TABLE film (
- id INTEGER NOT NULL PRIMARY KEY DEFAULT "0" ,
- name TEXT , dir TEXT ,
- Synopsis TEXT ,
- img TEXT ,
- sortie TEXT ,
- realisateur TEXT ,
- avec TEXT ,
- film TEXT ,
- genre TEXT ,
- Duree TEXT ,
- production TEXT
- ) ; ');
-}
-if(!@sqlite_query($db,"SELECT id FROM film")){
- $requete='SELECT * from film ORDER BY name asc';
- $result = sqlite_query($db,$requete);
- sqlite_query($db,'DROP TABLE film;');
- sqlite_query($db,'CREATE TABLE film ( id INTEGER NOT NULL PRIMARY KEY DEFAULT "0" , name TEXT , dir TEXT , Synopsis TEXT , img TEXT , sortie TEXT , realisateur TEXT , avec TEXT , film TEXT , genre TEXT , Duree TEXT , production TEXT );');
- while ($row = sqlite_fetch_array($result)) {
- sqlite_query($db,'INSERT INTO film VALUES (NULL,\''.sqlite_escape_string($row[name]).'\',\''.sqlite_escape_string($row[dir]).'\',\''.sqlite_escape_string($row[Synopsis]).'\',\''.sqlite_escape_string($row[img]).'\',\''.sqlite_escape_string($row[sortie]).'\',\''.sqlite_escape_string($row[realisateur]).'\',\''.sqlite_escape_string($row[avec]).'\',\''.sqlite_escape_string($row[film]).'\',\''.sqlite_escape_string($row[genre]).'\',\''.sqlite_escape_string($row[Duree]).'\',\''.sqlite_escape_string($row[production]).'\');');
- }
-}
if($_GET['supid']!=""){
sqlite_query($db,'DELETE FROM film WHERE ROWID = '.$_GET['supid'].'');
}
+
echo '<center>
<H1>Gestion de la base de donn\xE9es des films</H1><br><a href="index1.php">Retour \xE0 la configuration</a> - <a href="index1.php?page=54">Ajouter un film</a> - <a href="index1.php?page=53&deleteall=1">Purger la base de donn\xE9es</a><br>
<table width="841">
Modified: trunk/configuration/configmodif.php
===================================================================
--- trunk/configuration/configmodif.php 2006-12-21 15:41:32 UTC (rev 62)
+++ trunk/configuration/configmodif.php 2007-01-06 11:42:46 UTC (rev 63)
@@ -11,7 +11,7 @@
$info=Array();
$info['synopsis'] = "Aucune information";
} else {
- sqlite_query($db,'UPDATE film SET Synopsis=\''.sqlite_escape_string($info['synopsis']).'\', img=\''.sqlite_escape_string($info['image']).'\' , sortie=\''.sqlite_escape_string($info['date_sortie']).'\' , realisateur=\''.sqlite_escape_string($info['realisateur']).'\' , avec=\''.sqlite_escape_string($info['acteurs']).'\' , film=\''.sqlite_escape_string($info['nationalite']).'\' , genre=\''.sqlite_escape_string($info['genre']).'\' , Duree=\''.sqlite_escape_string($info['duree']).'\' , production=\''.sqlite_escape_string($info['anne_prod']).'\' , critique_visiteurs = \''.sqlite_escape_string($info['critique_visiteurs']).'\' , critique_presse = \''.sqlite_escape_string($info['critique_presse']).'\' WHERE id='.$resultat[0]['id']);
+ sqlite_query($db,'UPDATE film SET Synopsis=\''.sqlite_escape_string($info['synopsis']).'\', img=\''.sqlite_escape_string($info['image']).'\' , sortie=\''.sqlite_escape_string($info['date_sortie']).'\' , realisateur=\''.sqlite_escape_string($info['realisateur']).'\' , avec=\''.sqlite_escape_string($info['acteurs']).'\' , film=\''.sqlite_escape_string($info['nationalite']).'\' , genre=\''.sqlite_escape_string($info['genre']).'\' , Duree=\''.sqlite_escape_string($info['duree']).'\' , production=\''.sqlite_escape_string($info['anne_prod']).'\' , critique_visiteurs = \''.sqlite_escape_string($info['critique_visiteurs']).'\' , critique_presse = \''.sqlite_escape_string($info['critique_presse']).'\' , auto=\'1\' , last_update=\''.time().'\' WHERE id='.$resultat[0]['id']);
}
echo '<meta http-equiv="refresh" content="0;url=index1.php?page=55&get_info=0&id='.$_GET['id'].'">';
sqlite_close($db);
@@ -19,10 +19,9 @@
// Effacement des infos du films
elseif($_GET['get_info']==-1){
$db = sqlite_open('../_utilisateur/video.db', 0666);
- //On r\x82cup\x8Are les infos sur allocin\x82 pour chaque film
$info=Array();
$info['synopsis'] = "Informations effac\xE9es";
- $requete= 'UPDATE film SET Synopsis=\''.sqlite_escape_string($info['synopsis']).'\', img=\'\' , sortie=\'\' , realisateur=\'\' , avec=\'\' , film=\'\' , genre=\'\' , Duree=\'\' , production=\'\' , critique_visiteurs = \'0\' , critique_presse = \'0\' WHERE id='.$_GET['id'];
+ $requete= 'UPDATE film SET Synopsis=\''.sqlite_escape_string($info['synopsis']).'\', img=\'\' , sortie=\'\' , realisateur=\'\' , avec=\'\' , film=\'\' , genre=\'\' , Duree=\'\' , production=\'\' , critique_visiteurs = \'0\' , critique_presse = \'0\' , auto=\'0\' , last_update=\''.time().'\' WHERE id='.$_GET['id'];
sqlite_query($db,$requete);
echo '<meta http-equiv="refresh" content="0;url=index1.php?page=55&get_info=0&id='.$_GET['id'].'">';
@@ -41,7 +40,7 @@
$info=Array();
$info['synopsis'] = "Aucune information";
} else {
- sqlite_query($db,'UPDATE film SET Synopsis=\''.sqlite_escape_string($info['synopsis']).'\', img=\''.sqlite_escape_string($info['image']).'\' , sortie=\''.sqlite_escape_string($info['date_sortie']).'\' , realisateur=\''.sqlite_escape_string($info['realisateur']).'\' , avec=\''.sqlite_escape_string($info['acteurs']).'\' , film=\''.sqlite_escape_string($info['nationalite']).'\' , genre=\''.sqlite_escape_string($info['genre']).'\' , Duree=\''.sqlite_escape_string($info['duree']).'\' , production=\''.sqlite_escape_string($info['anne_prod']).'\' , critique_visiteurs = \''.sqlite_escape_string($info['critique_visiteurs']).'\' , critique_presse = \''.sqlite_escape_string($info['critique_presse']).'\' WHERE id='.$resultat[0]['id']);
+ sqlite_query($db,'UPDATE film SET Synopsis=\''.sqlite_escape_string($info['synopsis']).'\', img=\''.sqlite_escape_string($info['image']).'\' , sortie=\''.sqlite_escape_string($info['date_sortie']).'\' , realisateur=\''.sqlite_escape_string($info['realisateur']).'\' , avec=\''.sqlite_escape_string($info['acteurs']).'\' , film=\''.sqlite_escape_string($info['nationalite']).'\' , genre=\''.sqlite_escape_string($info['genre']).'\' , Duree=\''.sqlite_escape_string($info['duree']).'\' , production=\''.sqlite_escape_string($info['anne_prod']).'\' , critique_visiteurs = \''.sqlite_escape_string($info['critique_visiteurs']).'\' , critique_presse = \''.sqlite_escape_string($info['critique_presse']).'\' , auto=\'0\' , last_update=\''.time().'\' WHERE id='.$resultat[0]['id']);
}
echo '<meta http-equiv="refresh" content="0;url=index1.php?page=55&get_info=0&id='.$_GET['id'].'">';
@@ -58,7 +57,7 @@
$info=Array();
$info['synopsis'] = "Aucune information";
} else {
- sqlite_query($db,'UPDATE film SET Synopsis=\''.sqlite_escape_string($info['synopsis']).'\', img=\''.sqlite_escape_string($info['image']).'\' , sortie=\''.sqlite_escape_string($info['date_sortie']).'\' , realisateur=\''.sqlite_escape_string($info['realisateur']).'\' , avec=\''.sqlite_escape_string($info['acteurs']).'\' , film=\''.sqlite_escape_string($info['nationalite']).'\' , genre=\''.sqlite_escape_string($info['genre']).'\' , Duree=\''.sqlite_escape_string($info['duree']).'\' , production=\''.sqlite_escape_string($info['anne_prod']).'\' WHERE id='.$resultat[0]['id']);
+ sqlite_query($db,'UPDATE film SET Synopsis=\''.sqlite_escape_string($info['synopsis']).'\', img=\''.sqlite_escape_string($info['image']).'\' , sortie=\''.sqlite_escape_string($info['date_sortie']).'\' , realisateur=\''.sqlite_escape_string($info['realisateur']).'\' , avec=\''.sqlite_escape_string($info['acteurs']).'\' , film=\''.sqlite_escape_string($info['nationalite']).'\' , genre=\''.sqlite_escape_string($info['genre']).'\' , Duree=\''.sqlite_escape_string($info['duree']).'\' , production=\''.sqlite_escape_string($info['anne_prod']).'\' , auto=\'0\' , last_update=\''.time().'\' WHERE id='.$resultat[0]['id']);
}
echo '<meta http-equiv="refresh" content="0;url=index1.php?page=55&get_info=0&id='.$_GET['id'].'">';
@@ -87,8 +86,10 @@
Duree = \''.sqlite_escape_string($_REQUEST['Duree']).'\' ,
production = \''.sqlite_escape_string($_REQUEST['production']).'\',
critique_visiteurs = \''.sqlite_escape_string($_REQUEST['notevis']).'\',
- critique_presse = \''.sqlite_escape_string($_REQUEST['notecri']).'\'
- WHERE ROWID = '.$_REQUEST['id'];
+ critique_presse = \''.sqlite_escape_string($_REQUEST['notecri']).'\',
+ auto=\''.sqlite_escape_string($_REQUEST['auto']).'\' ,
+ last_update=\''.time().'\'
+ WHERE ROWID = '.$_REQUEST['id'];
$result = sqlite_query($db,$requete);
}
$result = sqlite_array_query($db, 'SELECT * from film where id = '.$_GET['id'], SQLITE_ASSOC);
@@ -136,7 +137,8 @@
<textarea rows="5" style="border: thin outset;font-size: 12px;" cols="60" name="Synopsis">'.stripslashes($entry['Synopsis']).'</textarea><br>
<br><u>Url de l\'image</u><br>
<textarea rows="2" style="border: thin outset;font-size: 12px;" cols="60" name="img">'.stripslashes($entry['img']).'</textarea><br>
- <br><center>
+ <input type="checkbox" name="auto" value="1">Cochez cette case si vous ne voulez pas qu\'Easybox r\xE9cup\xE8re automatiquement des informations pour ce film et \xE9crase les donn\xE9es fournies
+ <br><br><center>
<a href="index1.php?page=55&get_info=1&id='.$_REQUEST['id'].'">Mettre \xE0 jour les informations depuis AlloCin\xE9 (en fonction du titre actuellement rentr\xE9)</a> - <a href="index1.php?page=55&get_info=-1&id='.$_REQUEST['id'].'">Effacer toutes les informations actuelles sur ce film</a><br>
<input type="submit" style="border: thin outset;font-size: 9px;" value="Mettre \xE0 jour les informations depuis AlloCin\xE9 avec la fiche du film ayant l\'id"> <input type="text" style="border: thin outset;font-size: 9px;" name="num_allocine" value=""><br>
<br>
Modified: trunk/configuration/scan_amc.php
===================================================================
--- trunk/configuration/scan_amc.php 2006-12-21 15:41:32 UTC (rev 62)
+++ trunk/configuration/scan_amc.php 2007-01-06 11:42:46 UTC (rev 63)
@@ -132,7 +132,9 @@
\''.sqlite_escape_string($year).'\',
\''.sqlite_escape_string($rating).'\',
\''.sqlite_escape_string($rating).'\',
- \'\')';
+ \'\',
+ \'0\',
+ \'0\')';
sqlite_query($db,$sSql);
}
}
@@ -220,4 +222,4 @@
}
return $data;
}
-?>
\ No newline at end of file
+?>
Modified: trunk/configuration/scan_video.php
===================================================================
--- trunk/configuration/scan_video.php 2006-12-21 15:41:32 UTC (rev 62)
+++ trunk/configuration/scan_video.php 2007-01-06 11:42:46 UTC (rev 63)
@@ -5,11 +5,11 @@
include("../_framework/lib/get_info.php");
-$ext = $ini[explorateur][ext];
-$ext_noscan = $ini[explorateur][ext_noscan];
-$nettoyer = $ini[explorateur][nettoyer];
+$ext = $ini['explorateur']['ext'];
+$ext_noscan = $ini['explorateur']['ext_noscan'];
+$nettoyer = $ini['explorateur']['nettoyer'];
$nettoyer = explode(',',$nettoyer);
-$afficher_fichier_cache = $ini[explorateur][afficher_fichier_cache];
+$afficher_fichier_cache = $ini['explorateur']['afficher_fichier_cache'];
$extv=explode(",",$ext);
$ext_NoScanExploded=explode(",",$ext_noscan);
@@ -91,7 +91,6 @@
sqlite_query($db, 'DELETE FROM film WHERE id='.$entry['id']);
}
}
-
if (count($items) >= 1) {
$i=0;
@@ -101,7 +100,7 @@
$result=sqlite_query($db, 'SELECT * FROM film WHERE name="'.ucwords(strtolower(trim(str_ireplace($nettoyer,' ',basename(substr($file,0,strrpos($file,"."))))))).'"');
$rows = sqlite_num_rows($result);
if($rows=="0"){
- sqlite_query($db,'INSERT INTO film VALUES(NULL,\''.sqlite_escape_string(ucwords(strtolower(trim(str_ireplace($nettoyer,' ',basename(substr($file,0,strrpos($file,".")))))))).'\', \''.sqlite_escape_string($file).'\', NULL, NULL, \'2\', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL)');
+ sqlite_query($db,'INSERT INTO film VALUES(NULL,\''.sqlite_escape_string(ucwords(strtolower(trim(str_ireplace($nettoyer,' ',basename(substr($file,0,strrpos($file,".")))))))).'\', \''.sqlite_escape_string($file).'\', NULL, NULL, \'2\', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, 0)');
}
}
@@ -112,37 +111,52 @@
Liste des fichiers cr\xE9\xE9e... R\xE9cup\xE9ration des informations depuis allocin\xE9 (0%)
</font><?php
}elseif($_GET['get_info']==1){
- //On r\xE9cup\xE8re les infos sur allocin\xE9 pour chaque film
- $result=sqlite_query($db, 'SELECT id,name FROM film WHERE Synopsis IS NULL');
+
+
+
$result2=sqlite_query($db, 'SELECT id FROM film');
$total = sqlite_num_rows($result2);
+
+ //On r\xE9cup\xE8re les infos sur allocin\xE9 pour chaque film
+ if($_GET['research']==1){
+ $result=sqlite_query($db, 'SELECT id,name FROM film WHERE auto=1 ORDER BY last_update ASC limit 6');
+ }else{
+ $result=sqlite_query($db, 'SELECT id,name FROM film WHERE auto=1 AND Synopsis IS NULL limit 4');
+ $resultbis=sqlite_query($db, 'SELECT id,name FROM film WHERE auto=1 AND Synopsis IS NULL');
+ $num_rows2 = sqlite_num_rows($resultbis);
+ }
+
$num_rows = sqlite_num_rows($result);
$resultat = sqlite_fetch_all($result, SQLITE_ASSOC);
- for($i=0; $i<=min(($num_rows-1),3); $i++){
- $info=info_allocine($resultat[$i]['name'], true);
- if($info == "Aucun film trouv\xE9" OR $info == "erreur"){
- $info=Array();
- $info['synopsis'] = "Aucune information";
- $info['date_sortie'] = 2;
- }
- if($info['image']=='')
- $info['image'] = 'http://a69.g.akamai.net/n/69/10688/v1/img5.allocine.fr/acmedia/skin/AlloCineV5/habillage/AffichetteAllocine.gif';
-
- sqlite_query($db,'UPDATE film SET Synopsis=\''.sqlite_escape_string($info['synopsis']).'\', img=\''.sqlite_escape_string($info['image']).'\' , sortie=\''.sqlite_escape_string($info['date_sortie']).'\' , realisateur=\''.sqlite_escape_string($info['realisateur']).'\' , avec=\''.sqlite_escape_string($info['acteurs']).'\' , film=\''.sqlite_escape_string($info['nationalite']).'\' , genre=\''.sqlite_escape_string($info['genre']).'\' , Duree=\''.sqlite_escape_string($info['duree']).'\' , production=\''.sqlite_escape_string($info['anne_prod']).'\' , critique_visiteurs=\''.sqlite_escape_string($info['critique_visiteurs']).'\' , critique_presse=\''.sqlite_escape_string($info['critique_presse']).'\' , ba=\''.sqlite_escape_string($info['ba']).'\' WHERE id='.$resultat[$i]['id']);
-
- $acteurs = explode(',', trim($info['acteurs']));
-
- foreach($acteurs as $celebrite){
- if(sqlite_num_rows(sqlite_query($db, 'SELECT * FROM celebrite WHERE nom="'.trim($celebrite).'"'))=="0"){
- sqlite_query($db,'INSERT INTO celebrite VALUES(NULL,\''.sqlite_escape_string(trim($celebrite)).'\', NULL, NULL, NULL, NULL, NULL)');
+ for($i=0; $i<$num_rows; $i++){
+ $info=info_allocine($resultat[$i]['name'], true);
+ if($info == "Aucun film trouv\xE9" OR $info == "erreur"){
+ $info=Array();
+ $info['synopsis'] = "Aucune information";
+ $info['date_sortie'] = 2;
}
+
+ if($info['image']=='')
+ $info['image'] = 'http://a69.g.akamai.net/n/69/10688/v1/img5.allocine.fr/acmedia/skin/AlloCineV5/habillage/AffichetteAllocine.gif';
+
+ sqlite_query($db,'UPDATE film SET Synopsis=\''.sqlite_escape_string($info['synopsis']).'\', img=\''.sqlite_escape_string($info['image']).'\' , sortie=\''.sqlite_escape_string($info['date_sortie']).'\' , realisateur=\''.sqlite_escape_string($info['realisateur']).'\' , avec=\''.sqlite_escape_string($info['acteurs']).'\' , film=\''.sqlite_escape_string($info['nationalite']).'\' , genre=\''.sqlite_escape_string($info['genre']).'\' , Duree=\''.sqlite_escape_string($info['duree']).'\' , production=\''.sqlite_escape_string($info['anne_prod']).'\' , critique_visiteurs=\''.sqlite_escape_string($info['critique_visiteurs']).'\' , critique_presse=\''.sqlite_escape_string($info['critique_presse']).'\' , ba=\''.sqlite_escape_string($info['ba']).'\' , last_update=\''.time().'\' WHERE id='.$resultat[$i]['id']);
+
+ $acteurs = explode(',', trim($info['acteurs']));
+
+ if(! empty($acteurs)){
+ foreach($acteurs as $celebrite){
+ if(sqlite_num_rows(sqlite_query($db, 'SELECT * FROM celebrite WHERE nom="'.trim($celebrite).'"'))=="0"){
+ sqlite_query($db,'INSERT INTO celebrite VALUES(NULL,\''.sqlite_escape_string(trim($celebrite)).'\', NULL, NULL, NULL, NULL, NULL, 0)');
+ }
+ }
+ }
+ if(! empty($info['realisateur'])){
+ if(sqlite_num_rows(sqlite_query($db, 'SELECT * FROM celebrite WHERE nom="'.trim($info['realisateur']).'"'))=="0"){
+ sqlite_query($db,'INSERT INTO celebrite VALUES(NULL,\''.sqlite_escape_string(trim($info['realisateur'])).'\', NULL, NULL, NULL, NULL, NULL, 0)');
+ }
+ }
}
-
- if(sqlite_num_rows(sqlite_query($db, 'SELECT * FROM celebrite WHERE nom="'.trim($info['realisateur']).'"'))=="0"){
- sqlite_query($db,'INSERT INTO celebrite VALUES(NULL,\''.sqlite_escape_string(trim($info['realisateur'])).'\', NULL, NULL, NULL, NULL, NULL)');
- }
- }
if($num_rows<4){
@@ -151,29 +165,39 @@
echo '<br><a href="index1.php?page=4">Pour arr\xE9ter le scan, cliquez ici</a>';
}else{
echo '<meta http-equiv="refresh" content="0;url=index1.php?page=52&get_info=1">'."\n";
- echo '<font size="3">R\xE9cup\xE9ration des informations depuis allocin\xE9 ('.round((($total-($num_rows-3))/$total)*100).'%)</font>';
+ echo '<font size="3">R\xE9cup\xE9ration des informations depuis allocin\xE9 ('.round((($total-($num_rows2-4))/$total)*100).'%)</font>';
echo '<br><a href="index1.php?page=4">Pour arr\xE9ter le scan, cliquez ici</a>';
}
}elseif($_GET['get_celebrites']==1){
+ //On r\xE9cup\xE8re les infos sur allocin\xE9 pour chaque celebrit\xE9
- //On r\xE9cup\xE8re les infos sur allocin\xE9 pour chaque celebrit\xE9
- $result=sqlite_query($db, 'SELECT id,nom FROM celebrite WHERE bio IS NULL');
$result2=sqlite_query($db, 'SELECT id FROM celebrite');
$total = sqlite_num_rows($result2);
+
+ if($_GET['research']==1){
+ $result=sqlite_query($db, 'SELECT id,nom FROM celebrite ORDER BY last_update ASC limit 10');
+ }else{
+ $result=sqlite_query($db, 'SELECT id,nom FROM celebrite WHERE bio IS NULL limit 6');
+ $resultbis=sqlite_query($db, 'SELECT id,nom FROM celebrite WHERE bio IS NULL');
+ $num_rows2 = sqlite_num_rows($resultbis);
+ }
+
$num_rows = sqlite_num_rows($result);
$resultat = sqlite_fetch_all($result, SQLITE_ASSOC);
- for($i=0; $i<=min(($num_rows-1),5); $i++){
+
+
+ for($i=0; $i<$num_rows; $i++){
$info=info_personnalite($resultat[$i]['nom']);
if($info == "erreur"){
$info=Array();
$info['bio'] = "Aucune information";
$info['date_naissance'] = 2;
}
-
+
if($info['image']=='')
$info['image'] = 'http://a69.g.akamai.net/n/69/10688/v1/img5.allocine.fr/acmedia/skin/AlloCineV5/habillage/AffichetteAllocine.gif';
- sqlite_query($db,'UPDATE celebrite SET date_naissance=\''.sqlite_escape_string($info['date_naissance']).'\', lieu_naissance=\''.sqlite_escape_string($info['lieu_naissance']).'\', img=\''.sqlite_escape_string($info['image']).'\' , bio=\''.sqlite_escape_string($info['biographie']).'\' , statut=\''.sqlite_escape_string($info['statut']).'\' WHERE id='.$resultat[$i]['id']);
+ sqlite_query($db,'UPDATE celebrite SET date_naissance=\''.sqlite_escape_string($info['date_naissance']).'\', lieu_naissance=\''.sqlite_escape_string($info['lieu_naissance']).'\', img=\''.sqlite_escape_string($info['image']).'\' , bio=\''.sqlite_escape_string($info['biographie']).'\' , statut=\''.sqlite_escape_string($info['statut']).'\' , last_update=\''.time().'\' WHERE id='.$resultat[$i]['id']);
}
if($num_rows<6){
@@ -183,7 +207,7 @@
<?
}else{
echo '<meta http-equiv="refresh" content="0;url=index1.php?page=52&get_celebrites=1">'."\n";
- echo '<font size="3">R\xE9cup\xE9ration des informations sur les c\xE9l\xE9brit\xE9s ('.round((($total-($num_rows-5))/$total)*100).'%)</font>';
+ echo '<font size="3">R\xE9cup\xE9ration des informations sur les c\xE9l\xE9brit\xE9s ('.round((($total-($num_rows2-6))/$total)*100).'%)</font>';
echo '<br><a href="index1.php?page=4">Pour arr\xE9ter le scan, cliquez ici</a>';
}
Modified: trunk/http-vlc/lecteur/play-low.html
===================================================================
--- trunk/http-vlc/lecteur/play-low.html 2006-12-21 15:41:32 UTC (rev 62)
+++ trunk/http-vlc/lecteur/play-low.html 2007-01-06 11:42:46 UTC (rev 63)
@@ -62,7 +62,7 @@
<vlc id="rpn" param1="vlc_stop" />
<vlc id="rpn" param1="playlist_empty" />
<vlc id="rpn" param1="'temps' url_extract 'fake-duration' vlc_config_set" />
- <vlc id="rpn" param1="'fake: :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=1024 :sout-transcode-acodec=mpga :sout-transcode-ab=128 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :fake-aspect-ratio=4:3 :fake-keep-ar :fake-file=' mrl value strcat mrl value playlist_add vlc_play" />
+ <vlc id="rpn" param1="'fake: :sout=#transcode:std :sout-transcode-width=480 :sout-transcode-height=576 :sout-transcode-vb=1024 :sout-transcode-vcodec=mp2v :sout-transcode-vfilter=deinterlace :sout-deinterlace-mode=blend :sout-transcode-vb=9000 :sout-transcode-vcodec=mp2v :sout-ffmpeg-keyint=8 :sout-ffmpeg-interlace :no-sout-ffmpeg-interlace-me :fake-aspect-ratio=4:3 :fake-keep-ar :fake-deinterlace :deinterlace-mode=blend :fake-file=' mrl value strcat mrl value playlist_add vlc_play" />
<vlc id="end" />
@@ -72,7 +72,7 @@
<vlc id="rpn" param1="0 random 'VLC_OBJECT_PLAYLIST' vlc_var_set"/>
<vlc id="rpn" param1="0 repeat 'VLC_OBJECT_PLAYLIST' vlc_var_set"/>
<vlc id="rpn" param1="'temps' url_extract 'fake-duration' vlc_config_set" />
- <vlc id="rpn" param1="'fake: :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=1024 :sout-transcode-acodec=mpga :sout-transcode-ab=128 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :fake-aspect-ratio=4:3 :fake-keep-ar :fake-file=' mrl value strcat mrl value playlist_add" />
+ <vlc id="rpn" param1="'fake: :sout=#transcode:std :sout-transcode-width=480 :sout-transcode-height=576 :sout-transcode-vb=1024 :sout-transcode-vcodec=mp2v :sout-transcode-vfilter=deinterlace :sout-deinterlace-mode=blend :sout-transcode-vb=9000 :sout-transcode-vcodec=mp2v :sout-ffmpeg-keyint=8 :sout-ffmpeg-interlace :no-sout-ffmpeg-interlace-me :fake-aspect-ratio=4:3 :fake-keep-ar :fake-deinterlace :deinterlace-mode=blend :fake-file=' mrl value strcat mrl value playlist_add" />
<vlc id="end" />
Modified: trunk/http-vlc/lecteur/play-wifi.html
===================================================================
--- trunk/http-vlc/lecteur/play-wifi.html 2006-12-21 15:41:32 UTC (rev 62)
+++ trunk/http-vlc/lecteur/play-wifi.html 2007-01-06 11:42:46 UTC (rev 63)
@@ -62,7 +62,7 @@
<vlc id="rpn" param1="vlc_stop" />
<vlc id="rpn" param1="playlist_empty" />
<vlc id="rpn" param1="'temps' url_extract 'fake-duration' vlc_config_set" />
- <vlc id="rpn" param1="'fake: :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=2048 :sout-transcode-acodec=mpga :sout-transcode-ab=128 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :fake-aspect-ratio=4:3 :fake-keep-ar :fake-file=' mrl value strcat mrl value playlist_add vlc_play" />
+ <vlc id="rpn" param1="'fake: :sout=#transcode:std :sout-transcode-width=480 :sout-transcode-height=576 :sout-transcode-vb=2048 :sout-transcode-vcodec=mp2v :sout-transcode-vfilter=deinterlace :sout-deinterlace-mode=blend :sout-transcode-vb=9000 :sout-transcode-vcodec=mp2v :sout-ffmpeg-keyint=8 :sout-ffmpeg-interlace :no-sout-ffmpeg-interlace-me :fake-aspect-ratio=4:3 :fake-keep-ar :fake-deinterlace :deinterlace-mode=blend :fake-file=' mrl value strcat mrl value playlist_add vlc_play" />
<vlc id="end" />
@@ -72,7 +72,7 @@
<vlc id="rpn" param1="0 random 'VLC_OBJECT_PLAYLIST' vlc_var_set"/>
<vlc id="rpn" param1="0 repeat 'VLC_OBJECT_PLAYLIST' vlc_var_set"/>
<vlc id="rpn" param1="'temps' url_extract 'fake-duration' vlc_config_set" />
- <vlc id="rpn" param1="'fake: :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=2048 :sout-transcode-acodec=mpga :sout-transcode-ab=128 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :fake-aspect-ratio=4:3 :fake-keep-ar :fake-file=' mrl value strcat mrl value playlist_add" />
+ <vlc id="rpn" param1="'fake: :sout=#transcode:std :sout-transcode-width=480 :sout-transcode-height=576 :sout-transcode-vb=1024 :sout-transcode-vcodec=mp2v :sout-transcode-vfilter=deinterlace :sout-deinterlace-mode=blend :sout-transcode-vb=9000 :sout-transcode-vcodec=mp2v :sout-ffmpeg-keyint=8 :sout-ffmpeg-interlace :no-sout-ffmpeg-interlace-me :fake-aspect-ratio=4:3 :fake-keep-ar :fake-deinterlace :deinterlace-mode=blend :fake-file=' mrl value strcat mrl value playlist_add" />
<vlc id="end" />
Modified: trunk/http-vlc/lecteur/play.html
===================================================================
--- trunk/http-vlc/lecteur/play.html 2006-12-21 15:41:32 UTC (rev 62)
+++ trunk/http-vlc/lecteur/play.html 2007-01-06 11:42:46 UTC (rev 63)
@@ -62,7 +62,7 @@
<vlc id="rpn" param1="vlc_stop" />
<vlc id="rpn" param1="playlist_empty" />
<vlc id="rpn" param1="'temps' url_extract 'fake-duration' vlc_config_set" />
- <vlc id="rpn" param1="'fake: :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=4096 :sout-transcode-acodec=mpga :sout-transcode-ab=256 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :fake-aspect-ratio=4:3 :fake-keep-ar :fake-file=' mrl value strcat mrl value playlist_add vlc_play" />
+ <vlc id="rpn" param1="'fake: :sout=#transcode:std :sout-transcode-width=480 :sout-transcode-height=576 :sout-transcode-vb=4096 :sout-transcode-vcodec=mp2v :sout-transcode-vfilter=deinterlace :sout-deinterlace-mode=blend :sout-transcode-vb=9000 :sout-transcode-vcodec=mp2v :sout-ffmpeg-keyint=8 :sout-ffmpeg-interlace :no-sout-ffmpeg-interlace-me :fake-aspect-ratio=4:3 :fake-keep-ar :fake-deinterlace :deinterlace-mode=blend :fake-file=' mrl value strcat mrl value playlist_add vlc_play" />
<vlc id="end" />
@@ -72,7 +72,7 @@
<vlc id="rpn" param1="0 random 'VLC_OBJECT_PLAYLIST' vlc_var_set"/>
<vlc id="rpn" param1="0 repeat 'VLC_OBJECT_PLAYLIST' vlc_var_set"/>
<vlc id="rpn" param1="'temps' url_extract 'fake-duration' vlc_config_set" />
- <vlc id="rpn" param1="'fake: :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=4096 :sout-transcode-acodec=mpga :sout-transcode-ab=256 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :fake-aspect-ratio=4:3 :fake-keep-ar :fake-file=' mrl value strcat mrl value playlist_add" />
+ <vlc id="rpn" param1="'fake: :sout=#transcode:std :sout-transcode-width=480 :sout-transcode-height=576 :sout-transcode-vb=4096 :sout-transcode-vcodec=mp2v :sout-transcode-vfilter=deinterlace :sout-deinterlace-mode=blend :sout-transcode-vb=9000 :sout-transcode-vcodec=mp2v :sout-ffmpeg-keyint=8 :sout-ffmpeg-interlace :no-sout-ffmpeg-interlace-me :fake-aspect-ratio=4:3 :fake-keep-ar :fake-deinterlace :deinterlace-mode=blend :fake-file=' mrl value strcat mrl value playlist_add" />
<vlc id="end" />
Modified: trunk/module/films/catalogue.php
===================================================================
--- trunk/module/films/catalogue.php 2006-12-21 15:41:32 UTC (rev 62)
+++ trunk/module/films/catalogue.php 2007-01-06 11:42:46 UTC (rev 63)
@@ -28,7 +28,7 @@
$LINK['red']= $MODULE.'_menu/menu.php';
- $sens1['name'] = $sens1['perso'] = $sens1['date'] = $sens1['film'] = $sens1['genre'] = $sens;
+ $sens1['name'] = $sens1['perso'] = $sens1['date'] = $sens1['film'] = $sens1['genre'] = $sens1['id'] = $sens;
$sens1[$tri] = $sens_contraire;
@@ -39,23 +39,26 @@
save_variable('sens_bib', $sens);
save_variable('suiv_bib', urldecode($_GET['suiv']));
- $MENU_ALT=array(array('lien'=>'catalogue.php?tri='.$tri.'&sens='.$sens, 'nom'=>'Tri par ', 'selected'=>0),
- array('lien'=>'catalogue.php?tri=name&sens='.$sens1['name'], 'nom'=>'<img border="0" src="'.$INTERFACE_REP.$sens.'.gif"> Nom', 'selected'=>$tri=='name', 'front_pannel'=>'NOM'),
+ $MENU_ALT=array(array('lien'=>'catalogue.php?tri=name&sens='.$sens1['name'], 'nom'=>'<img border="0" src="'.$INTERFACE_REP.$sens.'.gif"> Nom', 'selected'=>$tri=='name', 'front_pannel'=>'NOM'),
array('lien'=>'catalogue.php?tri=date&sens='.$sens1['date'], 'nom'=>'<img border="0" src="'.$INTERFACE_REP.$sens.'.gif"> Date', 'selected'=>$tri=='date', 'front_pannel'=>'DATE'),
array('lien'=>'catalogue.php?tri=perso&sens='.$sens1['perso'], 'nom'=>'<img border="0" src="'.$INTERFACE_REP.$sens.'.gif"> C\xE9l\xE9brit\xE9', 'selected'=>$tri=='perso', 'front_pannel'=>'CELEBRITE'),
array('lien'=>'catalogue.php?tri=film&sens='.$sens1['film'], 'nom'=>'<img border="0" src="'.$INTERFACE_REP.$sens.'.gif"> National.', 'selected'=>$tri=='film', 'front_pannel'=>'NATIONAL.'),
- array('lien'=>'catalogue.php?tri=genre&sens='.$sens1['genre'], 'nom'=>'<img border="0" src="'.$INTERFACE_REP.$sens.'.gif"> Genre', 'selected'=>$tri=='genre', 'front_pannel'=>'GENRE'));
+ array('lien'=>'catalogue.php?tri=genre&sens='.$sens1['genre'], 'nom'=>'<img border="0" src="'.$INTERFACE_REP.$sens.'.gif"> Genre', 'selected'=>$tri=='genre', 'front_pannel'=>'GENRE'),
+ array('lien'=>'catalogue.php?tri=id&sens='.$sens1['id'], 'nom'=>'<img border="0" src="'.$INTERFACE_REP.$sens.'.gif"> Id', 'selected'=>$tri=='id', 'front_pannel'=>'ID'));
$db = sqlite_open($USER.'video.db', 0666);
- if($tri=="name")
- {
+ if($tri=="name") {
$requete='SELECT * from film WHERE name!=\'\' ORDER BY name '.$sens_rec;
$result = sqlite_query($db,$requete);
$smarty->assign('result',sqlite_fetch_all($result));
$smarty->assign('rows',@sqlite_num_rows($result));
- } elseif($tri=='perso')
- {
+ } elseif($tri=="id") {
+ $requete='SELECT * from film WHERE name!=\'\' ORDER BY id '.$sens_rec;
+ $result = sqlite_query($db,$requete);
+ $smarty->assign('result',sqlite_fetch_all($result));
+ $smarty->assign('rows',@sqlite_num_rows($result));
+ } elseif($tri=='perso') {
if (!isset($_GET['suiv']) OR $_GET['suiv']=='')
{
$requete='SELECT * from celebrite WHERE nom!=\'\' ORDER BY nom '.$sens_rec;
@@ -74,10 +77,8 @@
$smarty->assign('result',sqlite_fetch_all($result));
$smarty->assign('info',sqlite_fetch_array($result2));
}
- } elseif($tri=="film" || $tri=="genre")
- {
- if (!isset($_GET['suiv']))
- {
+ } elseif($tri=="film" || $tri=="genre") {
+ if (!isset($_GET['suiv'])) {
$requete='SELECT * from film ORDER BY '.$tri.' '.$sens_rec;
$result = sqlite_query($db,$requete);
$i="0";
@@ -98,8 +99,7 @@
sort($rea);
$smarty->assign('rea',$rea);
- } else
- {
+ } else {
$suiv = urldecode($_GET['suiv']);
$requete='SELECT * from film WHERE '.$tri.' like \'%'.sqlite_escape_string($suiv).'%\' ORDER BY name asc ';
$result = sqlite_query($db,$requete);
@@ -108,15 +108,14 @@
$smarty->assign('suiv',$_GET['suiv']);
$smarty->assign('tri',$tri.'_suiv');
}
- } elseif($tri=="date")
- {
+ } elseif($tri=="date") {
$requete='SELECT * from film ORDER BY sortie '.$sens_rec.',name '.$sens_rec;
$result = sqlite_query($db,$requete);
$smarty->assign('result',sqlite_fetch_all($result));
$smarty->assign('rows',@sqlite_num_rows($result));
}
- $title = array('film'=>'Nationalit\xE9', 'name'=>'Titre', 'date'=>'ann\xE9e de production', 'perso'=>'Personnalit\xE9', 'genre'=>'Genre');
+ $title = array('film'=>'Nationalit\xE9', 'name'=>'Titre', 'date'=>'ann\xE9e de production', 'perso'=>'Personnalit\xE9', 'genre'=>'Genre', 'id'=>'id');
$smarty->assign('TITRE','Biblioth\xE8que de films - Tri par '.$title[$tri]);
$smarty->assign('_GET',$_GET);
Modified: trunk/module/films/catalogue_video.tpl
===================================================================
--- trunk/module/films/catalogue_video.tpl 2006-12-21 15:41:32 UTC (rev 62)
+++ trunk/module/films/catalogue_video.tpl 2007-01-06 11:42:46 UTC (rev 63)
@@ -1,4 +1,4 @@
-{if $tri=="name" OR $tri=="date" OR $tri=="perso"}
+{if $tri=="name" OR $tri=="date" OR $tri=="perso" OR $tri=="id"}
{assign var=NUM_ROW_AFFICH value=15}
{section name=files loop=$result max=$NUM_ROW_AFFICH start=$MIN}
@@ -12,7 +12,7 @@
{/if}
{/if}
- {if $tri=="name" OR $tri=="date"}
+ {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}"><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>
Modified: trunk/module/films/films.tpl
===================================================================
--- trunk/module/films/films.tpl 2006-12-21 15:41:32 UTC (rev 62)
+++ trunk/module/films/films.tpl 2007-01-06 11:42:46 UTC (rev 63)
@@ -20,9 +20,9 @@
{assign var=stream_1 value="`$VLC.pourcentage_courant/100*529`"|round}
{assign var=stream_2 value="`$stream_1*-1`"}
-{assign var=stream_3 value="`$stream_1/5`"|floor}
+{assign var=stream_3 value="`$stream_1/5+1`"|floor}
{assign var=stream_4 value="`$stream_2+529`"|floor}
-{assign var=stream_5 value="`$stream_4/5`"|floor}
+{assign var=stream_5 value="`$stream_4/5+1`"|floor}
{assign var=largeursautmoins value="`$VLC.duree_courante/$stream_3`"|floor}
{assign var=largeursautplus value="`$VLC.duree_restante/$stream_5`"|floor}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
