Menu
▾
▴
[Easybox-mod-developers] SF.net SVN: easybox-mod: [88] trunk
|
From: <ara...@us...> - 2007-03-04 08:03:09
|
Revision: 88
http://svn.sourceforge.net/easybox-mod/?rev=88&view=rev
Author: aragornis
Date: 2007-03-04 00:03:07 -0800 (Sun, 04 Mar 2007)
Log Message:
-----------
Mise ?\195?\160 jour du nom de la skin simple dans la cr?\195?\169ation du fichier configuration.ini
Am?\195?\169lioration de l'arret d'enregistrement
Correction d'un bug qui faisait se vider la base de donn?\195?\169es de vid?\195?\169os
Modified Paths:
--------------
trunk/_framework/img2fbx.php
trunk/configuration/config.xml
trunk/configuration/scan_video.php
trunk/lecteur/stop_rec.php
trunk/module/meteo/f2-france-512x384-j0pm.jpg
trunk/module/meteo/f2-france-512x384-j1am.jpg
trunk/module/meteo/f2-france-512x384-j1pm.jpg
trunk/skin/simplegreen/couleur.conf
trunk/version.html
Added Paths:
-----------
trunk/configuration/editrss.php
trunk/module/guidetv/listechainetelepoche.txt
Modified: trunk/_framework/img2fbx.php
===================================================================
--- trunk/_framework/img2fbx.php 2007-03-03 21:43:07 UTC (rev 87)
+++ trunk/_framework/img2fbx.php 2007-03-04 08:03:07 UTC (rev 88)
@@ -3,14 +3,15 @@
$CACHE_IMAGE = $RACINE_REP."/_utilisateur/cache/";
$sURL=urldecode($_REQUEST['sURL']);
+
+list($width, $height, $type) = getimagesize($sURL);
+
if (isset($_REQUEST['nbcouleurs'])) {
$nbcouleurs = $_REQUEST['nbcouleurs'];
} else {
$nbcouleurs = 128;
}
-list($width, $height, $type) = getimagesize($sURL);
-
function is_cached($url){
global $CACHE_IMAGE;
if(file_exists($CACHE_IMAGE.md5($url).'.gif')){
@@ -44,6 +45,7 @@
}
if(isset($_REQUEST['new_width']) && isset($_REQUEST['new_height'])){
+
$colors_handle = ImageCreatetruecolor($_REQUEST['new_width'],$_REQUEST['new_height']);
imagecopyresampled( $colors_handle, $oIm, 0, 0, 0, 0, $_REQUEST['new_width'], $_REQUEST['new_height'],$width, $height );
ImageTrueColorToPalette( $colors_handle, false, $nbcouleurs );
Modified: trunk/configuration/config.xml
===================================================================
--- trunk/configuration/config.xml 2007-03-03 21:43:07 UTC (rev 87)
+++ trunk/configuration/config.xml 2007-03-04 08:03:07 UTC (rev 88)
@@ -178,7 +178,7 @@
<souscat name="skin" >
<name>Skin par defaut</name>
<type>hidden</type>
- <defaut>simple</defaut>
+ <defaut>Simple</defaut>
</souscat>
</categorie>
<categorie name="download" >
Added: trunk/configuration/editrss.php
===================================================================
--- trunk/configuration/editrss.php (rev 0)
+++ trunk/configuration/editrss.php 2007-03-04 08:03:07 UTC (rev 88)
@@ -0,0 +1,63 @@
+<HTML>
+<HEAD>
+<style type="text/css" class="tableau">
+<!--
+body {
+ margin-left: 0px;
+ margin-top: 0px;
+ margin-right: 0px;
+ margin-bottom: 0px;
+}
+body,td,th {
+ color: #000000;
+}
+.tableau {
+ background-color: #EEEEEE;
+ border: thin outset;
+}
+a:link {
+ color: #000000;
+ text-decoration: none;
+}
+a:visited {
+ text-decoration: none;
+ color: #000000;
+}
+a:hover {
+ text-decoration: none;
+ color: #999999;
+}
+a:active {
+ text-decoration: none;
+ color: #999999;
+}
+
+-->
+</style>
+<?php
+if(isset($_GET['id']) AND $_GET['id']>=0){
+$id = $_GET['id'];
+}else{
+$id = '0';
+}
+
+?>
+</HEAD>
+<BODY>
+Vous pouvez ici \xE9diter un flux RSS<br><br>
+<form name="formnum1">
+Nom : <input type="text" value="" name="nom" id="nom" size="80" maxlenght="300"><br><br>
+Adresse : <input type="text" value="" name="add" id="add" size="80" maxlenght="300"> <br><br>
+Image : <input type="text" value="" name="image" id="image" size="80" maxlenght="300"><br><br>
+Description : <input type="text" value="" name="description" id="description" size="80" maxlenght="300"> <br><br>
+<input type="button" value="Modifier" onClick="window.opener.editchamp2('<?= $_GET['form']; ?>','<?= $_GET['select']; ?>','<?= $id; ?>',document.forms.formnum1.nom.value,document.forms.formnum1.add.value,document.forms.formnum1.image.value,document.forms.formnum1.description.value);window.close()">
+</form>
+
+<script language="javascript">
+document.forms.formnum1.nom.value = window.opener.document.forms.<?= $_GET['form']; ?>.list<?= $_GET['select']; ?>.options[<?= $id; ?>].text;
+document.forms.formnum1.add.value = window.opener.document.forms.<?= $_GET['form']; ?>.list<?= $_GET['select']; ?>.options[<?= $id; ?>].value.split('|')[1];
+document.forms.formnum1.image.value = window.opener.document.forms.<?= $_GET['form']; ?>.list<?= $_GET['select']; ?>.options[<?= $id; ?>].value.split('|')[2];
+document.forms.formnum1.description.value = window.opener.document.forms.<?= $_GET['form']; ?>.list<?= $_GET['select']; ?>.options[<?= $id; ?>].value.split('|')[3];
+</script>
+</BODY>
+</HTML>
Modified: trunk/configuration/scan_video.php
===================================================================
--- trunk/configuration/scan_video.php 2007-03-03 21:43:07 UTC (rev 87)
+++ trunk/configuration/scan_video.php 2007-03-04 08:03:07 UTC (rev 88)
@@ -4,6 +4,10 @@
<?php
include("../_framework/lib/get_info.php");
+require_once('../_framework/lib/ini.php');
+
+$CONFIG_INI = "../_utilisateur/configuration.ini";
+$ini_class = new INI($CONFIG_INI);
$ext = $ini['explorateur']['ext'];
$ext_noscan = $ini['explorateur']['ext_noscan'];
@@ -46,7 +50,7 @@
}
$items=Array();
-
+
function scandirrec($rep){
global $extv, $ext_NoScanExploded;
$item=Array();
@@ -105,7 +109,7 @@
}
}
}
- echo '<meta http-equiv="refresh" content="0;url=index1.php?page=52&get_info=1">'."\n";
+ // echo '<meta http-equiv="refresh" content="0;url=index1.php?page=52&get_info=1">'."\n";
?>
<font size="3">
Liste des fichiers cr\xE9\xE9e... R\xE9cup\xE9ration des informations depuis allocin\xE9 (0%)
Modified: trunk/lecteur/stop_rec.php
===================================================================
--- trunk/lecteur/stop_rec.php 2007-03-03 21:43:07 UTC (rev 87)
+++ trunk/lecteur/stop_rec.php 2007-03-04 08:03:07 UTC (rev 88)
@@ -3,7 +3,18 @@
$db = sqlite_open('../_utilisateur/records.db', 0666);
$requete='UPDATE records SET statut=\'Enregistr\xE9\' WHERE id='.$_GET['id'];
$result = sqlite_query($db,$requete);
+
+ $requete='SELECT * from records WHERE id='.$_GET['id'];
+ $result = sqlite_query($db,$requete);
+ $result = sqlite_fetch_array($result);
+
+ @unlink($result['fichierbat']);
+ @unlink(ereg_replace(".bat","-end.bat",$result['fichierbat']));
+ $at=exec('at '.$result['task'].' /delete');
+ $at.=exec('at '.$result['taskend'].' /delete');
+
+
$file1 = @file_get_contents("http://127.0.0.1:8082/lecteur/action.html?control=shutdown");
?>
Added: trunk/module/guidetv/listechainetelepoche.txt
===================================================================
--- trunk/module/guidetv/listechainetelepoche.txt (rev 0)
+++ trunk/module/guidetv/listechainetelepoche.txt 2007-03-04 08:03:07 UTC (rev 88)
@@ -0,0 +1,69 @@
+"001" = "1|TF1|612"[end]
+"002" = "2|France 2|201"[end]
+"003" = "3|France 3 national|202"[end]
+"003" = "300|France 3 national|258"[end]
+"003" = "301|France 3 Alsace|280"[end]
+"003" = "302|France 3 Alpes|283"[end]
+"003" = "303|France 3 Aquitaine|284"[end]
+"003" = "304|France 3 Auvergne|285"[end]
+"003" = "305|France 3 Bourgogne|279"[end]
+"003" = "306|France 3 Bretagne|286"[end]
+"003" = "307|France 3 Centre|287"[end]
+"003" = "308|France 3 Champagne-Ardenne|288"[end]
+"003" = "310|France 3 Côte-d'Azur|290"[end]
+"003" = "311|France 3 Franche-Comté|291"[end]
+"003" = "312|France 3 Languedoc-Roussillon|292"[end]
+"003" = "313|France 3 Limousin|293"[end]
+"003" = "314|France 3 Lorraine|294"[end]
+"003" = "315|France 3 Midi Pyrénées|295"[end]
+"003" = "316|France 3 Nord Pas-de-Calais|296"[end]
+"003" = "317|France 3 Haute-Normandie|297"[end]
+"003" = "318|France 3 Basse-Normandie|298"[end]
+"003" = "319|France 3 Paris Ile-de-France|257"[end]
+"003" = "320|France 3 Pays de Loire|299"[end]
+"003" = "321|France 3 Picardie|300"[end]
+"003" = "322|France 3 Poitou-Charentes|301"[end]
+"003" = "323|France 3 Provence-Alpes|302"[end]
+"003" = "324|France 3 Rhône-Alpes|303"[end]
+"005" = "7|Arte|204"[end]
+"006" = "6|M6|613"[end]
+"007" = "5|France 5|203"[end]
+"009" = "10|TMC|497"[end]
+"011" = "19|Paris Première|213"[end]
+"017" = "93|Histoire|235"[end]
+"028" = "14|France 4|376"[end]
+"029" = "53|Mezzo|265"[end]
+"031" = "44|MTV|219"[end]
+"033" = "43|Fun TV|433"[end]
+"038" = "9|W9|373"[end]
+"040" = "22|AB 1|211"[end]
+"045" = "230|TVE I|306"[end]
+"050" = "88|Animaux|248"[end]
+"079" = "73|BBC World|240"[end]
+"080" = "36|Mangas|253"[end]
+"081" = "91|Escales|252"[end]
+"113" = "89|Chasse et pêche|249"[end]
+"116" = "61|Equidia|212"[end]
+"121" = "69|Euronews|205"[end]
+"124" = "37|Game One|220"[end]
+"131" = "110|Action|242"[end]
+"147" = "111|Ciné Polar|244"[end]
+"149" = "112|Ciné FX|243"[end]
+"161" = "51|Trace TV|228"[end]
+"162" = "70|Bloomberg TV|207"[end]
+"163" = "84|Fashion TV|221"[end]
+"167" = "8|Direct 8|372"[end]
+"168" = "11|NT1|374"[end]
+"169" = "12|NRJ 12 5.1|381"[end]
+"169" = "12|NRJ 12 Stéréo|382"[end]
+"170" = "13|La Chaîne Parlementaire|226"[end]
+"173" = "266|2M Maroc|272"[end]
+"180" = "42|M6 Music Black|432"[end]
+"181" = "41|M6 Music Rock|431"[end]
+"183" = "64|Motors TV|216"[end]
+"189" = "48|VH1|233"[end]
+"191" = "40|M6 Music Hits|430"[end]
+"194" = "15|BFM TV|418"[end]
+"195" = "18|Gulli|419"[end]
+"201" = "131|M6 Boutique|359"[end]
+"202" = "87|Liberty TV|215"[end]
\ No newline at end of file
Modified: trunk/module/meteo/f2-france-512x384-j0pm.jpg
===================================================================
(Binary files differ)
Modified: trunk/module/meteo/f2-france-512x384-j1am.jpg
===================================================================
(Binary files differ)
Modified: trunk/module/meteo/f2-france-512x384-j1pm.jpg
===================================================================
(Binary files differ)
Modified: trunk/skin/simplegreen/couleur.conf
===================================================================
--- trunk/skin/simplegreen/couleur.conf 2007-03-03 21:43:07 UTC (rev 87)
+++ trunk/skin/simplegreen/couleur.conf 2007-03-04 08:03:07 UTC (rev 88)
@@ -67,7 +67,7 @@
COULEUR_FOND_AVERTISSEMENT = "#B7D88B3F"
#///////////////////////////////// Fond d'\xE9cran ///////////////////////////////////
-BACKGROUND = "background.jpg"
-TYPE = "int"
+BACKGROUND = "background.png"
+TYPE = "ext"
?>
Modified: trunk/version.html
===================================================================
--- trunk/version.html 2007-03-03 21:43:07 UTC (rev 87)
+++ trunk/version.html 2007-03-04 08:03:07 UTC (rev 88)
@@ -4,6 +4,6 @@
</head>
<body>
<h1>Easybox</h1>
-<h2>3.4.15</h2>
+<h2>4.0.0</h2>
</body>
</html>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
