Menu
▾
▴
[Easybox-mod-developeurs] SF.net SVN: easybox-mod:[240] trunk/http
|
From: <ara...@us...> - 2008-08-23 20:58:30
|
Revision: 240
http://easybox-mod.svn.sourceforge.net/easybox-mod/?rev=240&view=rev
Author: aragornis
Date: 2008-08-23 20:58:22 +0000 (Sat, 23 Aug 2008)
Log Message:
-----------
Modification des icones repr?\195?\169sentant les touches color?\195?\169es de la t?\195?\169l?\195?\169commande
Si seules les photos sont s?\195?\169lectionn?\195?\169es dans l'explorateur, on affiche au format mosaique l'explorateur
Une photo par d?\195?\169faut s'affiche quand la photo demand?\195?\169es n'est pas accessible pour Easybox
Nouvelle icone pour les dossiers dans l'explorateur
Nouvelles icones pour sp?\195?\169cifier "photos, videos ou musiques non affich?\195?\169es"
Nouvelles icones avec les bons noms pour le menu principal
Modified Paths:
--------------
trunk/http/_framework/lib/Explorateur.class.php
trunk/http/_framework/lib/Photo.class.php
trunk/http/_utilisateur/contentVLC
trunk/http/skin/mediacenter/interface/btn_bleu.gif
trunk/http/skin/mediacenter/interface/btn_jaune.gif
trunk/http/skin/mediacenter/interface/btn_rouge.gif
trunk/http/skin/mediacenter/interface/btn_vert.gif
trunk/http/skin/mediacenter/interface/noaudio.gif
trunk/http/skin/mediacenter/interface/nophoto.gif
trunk/http/skin/mediacenter/interface/novideo.gif
trunk/http/skin/mediacenter/sources/audio.png
trunk/http/skin/mediacenter/sources/photo.png
trunk/http/skin/mediacenter/sources/video.png
Added Paths:
-----------
trunk/http/module/VOD/classes/debug.txt
trunk/http/skin/mediacenter/icones/mamusique.gif
trunk/http/skin/mediacenter/icones/mesfavoris.gif
trunk/http/skin/mediacenter/icones/mesfichiers.gif
trunk/http/skin/mediacenter/icones/messignets.gif
trunk/http/skin/mediacenter/icones/mesvideos.gif
trunk/http/skin/mediacenter/icones/videosduweb.gif
trunk/http/skin/mediacenter/interface/folder.gif
trunk/http/skin/mediacenter/interface/nopic.gif
trunk/http/skin/mediacenter/sources/bouton.png
trunk/http/skin/mediacenter/sources/folder.png
trunk/http/skin/mediacenter/sources/nopic.png
Modified: trunk/http/_framework/lib/Explorateur.class.php
===================================================================
--- trunk/http/_framework/lib/Explorateur.class.php 2008-08-23 17:11:35 UTC (rev 239)
+++ trunk/http/_framework/lib/Explorateur.class.php 2008-08-23 20:58:22 UTC (rev 240)
@@ -87,7 +87,7 @@
if($this->type == SKIN_MOSAIQUE){
switch($e['type']){
case 'Dossier':
- $resultats[] = new ItemMosaique($e['nom'], $this->page_explorateur.'?rep='.urlencode($e['path']), 'image', '');
+ $resultats[] = new ItemMosaique($e['nom'], $this->page_explorateur.'?rep='.urlencode($e['path']), INTERFACE_REP.'folder.gif', '');
break;
case 'Video':
Modified: trunk/http/_framework/lib/Photo.class.php
===================================================================
--- trunk/http/_framework/lib/Photo.class.php 2008-08-23 17:11:35 UTC (rev 239)
+++ trunk/http/_framework/lib/Photo.class.php 2008-08-23 20:58:22 UTC (rev 240)
@@ -7,6 +7,8 @@
require_once(LIBRARIES_REP.'RemoteDL.class.php');
require_once(LIBRARIES_REP.'Ini.class.php');
+require_once($RACINE_REP.'/_framework/fonctions_partagees.inc.php');
+
$ini_class = new INI(USER.'configuration.ini');
class image {
@@ -129,12 +131,14 @@
}else{
$RemoteDL = new RemoteDL($this->url);
$RemoteDL->set_cache_time(0);
- if(!($data = $RemoteDL->file_get_contents())){
- if(file_exists($this->url)){
- $data = file_get_contents($this->url);
- }
+ if(file_exists($this->url)){
+ $data = file_get_contents($this->url);
+ }elseif($RemoteDL->url_validate()){
+ $data = $RemoteDL->file_get_contents();
+ }else{
+ $data = '';
}
-
+
if($data){
$this->img = imagecreatefromstring($data);
$this->width = imagesx($this->img);
@@ -174,7 +178,10 @@
// Fonction d'erreur
function error(){
- echo 'erreur';
+ global $RACINE_REP;
+ $img = new image(realpath($RACINE_REP).'/skin/'.skin_rep().'interface/nopic.gif', $_GET['width'], $_GET['height'], $_GET['angle'], $_GET['cache'], $_GET['quality'], $_GET['transparence']);
+ $img->process();
+ exit();
}
// Fonction trouvant le bon argument entre 0 et 360
Modified: trunk/http/_utilisateur/contentVLC
===================================================================
--- trunk/http/_utilisateur/contentVLC 2008-08-23 17:11:35 UTC (rev 239)
+++ trunk/http/_utilisateur/contentVLC 2008-08-23 20:58:22 UTC (rev 240)
@@ -19,10 +19,15 @@
+
+
+
+
+
-|00:00:00|current_node_url|00:00:04|playing|current_node_name
+|00:00:00|fake:|00:00:04|playing|C:\Program Files\Easyboxv3\http\skin\mediacenter\background\bg.png
Added: trunk/http/module/VOD/classes/debug.txt
===================================================================
--- trunk/http/module/VOD/classes/debug.txt (rev 0)
+++ trunk/http/module/VOD/classes/debug.txt 2008-08-23 20:58:22 UTC (rev 240)
@@ -0,0 +1,26 @@
+
+HTTP/1.0 302 Moved Temporarily
+Date: Sat, 23 Aug 2008 16:42:53 GMT
+Server: Apache
+Set-Cookie: wt=expires%3D1219509893%7Eaccess%3D%2F2%2FFLV-320x240%2F93%2F76%2F1419376.flv%7Emd5%3D4dac0d2338b382672afa2c9225dbf70a; path=/; domain=.wat.tv
+Location: http://wdk.wat.tv/2/FLV-320x240/93/76/1419376.flv
+Content-Length: 0
+Content-Type: text/html
+X-Cache: MISS from kuzh.polytechnique.fr
+Via: 1.0 kuzh.polytechnique.fr:8080 (squid)
+Proxy-Connection: keep-alive
+
+HTTP/1.0 200 OK
+Content-Type: video/x-flv
+ETag: "1844399291"
+Accept-Ranges: bytes
+Last-Modified: Fri, 08 Aug 2008 18:06:58 GMT
+Content-Length: 2548286
+Server: BustaWS/2.0
+Expires: Sat, 23 Aug 2008 16:42:53 GMT
+Cache-Control: max-age=0, no-cache
+Pragma: no-cache
+Date: Sat, 23 Aug 2008 16:42:53 GMT
+X-Cache: MISS from kuzh.polytechnique.fr
+Via: 1.0 kuzh.polytechnique.fr:8080 (squid)
+Proxy-Connection: keep-alive
Property changes on: trunk/http/module/VOD/classes/debug.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Property changes on: trunk/http/skin/mediacenter/icones/mamusique.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on: trunk/http/skin/mediacenter/icones/mesfavoris.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on: trunk/http/skin/mediacenter/icones/mesfichiers.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on: trunk/http/skin/mediacenter/icones/messignets.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on: trunk/http/skin/mediacenter/icones/mesvideos.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on: trunk/http/skin/mediacenter/icones/videosduweb.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on: trunk/http/skin/mediacenter/interface/folder.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on: trunk/http/skin/mediacenter/interface/nopic.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on: trunk/http/skin/mediacenter/sources/bouton.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on: trunk/http/skin/mediacenter/sources/folder.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on: trunk/http/skin/mediacenter/sources/nopic.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
