You can subscribe to this list here.
2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(5) |
Oct
(26) |
Nov
(10) |
Dec
(7) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2007 |
Jan
(7) |
Feb
(17) |
Mar
(25) |
Apr
(8) |
May
(33) |
Jun
(11) |
Jul
(1) |
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(2) |
Aug
(68) |
Sep
(2) |
Oct
|
Nov
|
Dec
|
From: <ara...@us...> - 2008-08-24 13:14:18
|
Revision: 241 http://easybox-mod.svn.sourceforge.net/easybox-mod/?rev=241&view=rev Author: aragornis Date: 2008-08-24 13:14:10 +0000 (Sun, 24 Aug 2008) Log Message: ----------- Modification de l'enregistrement de la configuration pour r?\195?\169soudre les probl?\195?\168mes de configuration perdue lors de l'enregistrement Modified Paths: -------------- trunk/http/_framework/lib/Ini.class.php trunk/http/_utilisateur/contentVLC trunk/http/configuration/config.xml trunk/http/configuration/configuration.php trunk/http/configuration/general.php trunk/http/configuration/script.js trunk/http/module/VOD/classes/debug.txt trunk/http/module/VOD/classes/player_proxy_wat.php trunk/http/skin/mediacenter/sources/bouton.png trunk/http/testing.php Removed Paths: ------------- trunk/http/out.txt Modified: trunk/http/_framework/lib/Ini.class.php =================================================================== --- trunk/http/_framework/lib/Ini.class.php 2008-08-23 20:58:22 UTC (rev 240) +++ trunk/http/_framework/lib/Ini.class.php 2008-08-24 13:14:10 UTC (rev 241) @@ -18,9 +18,7 @@ $reini .=$subkey2.' = "'.$entry2."\"\n"; } } - $handle = fopen($this->fichier, "w"); - fwrite($handle, $reini); - fclose($handle); + file_put_contents($this->fichier, $reini); } function del($cat, $cle){ Modified: trunk/http/_utilisateur/contentVLC =================================================================== --- trunk/http/_utilisateur/contentVLC 2008-08-23 20:58:22 UTC (rev 240) +++ trunk/http/_utilisateur/contentVLC 2008-08-24 13:14:10 UTC (rev 241) @@ -30,4 +30,4 @@ -|00:00:00|fake:|00:00:04|playing|C:\Program Files\Easyboxv3\http\skin\mediacenter\background\bg.png +|00:00:00|fake:|00:00:00|stop|C:\Program Files\Easyboxv3\http\skin\mediacenter\background\bg.png Modified: trunk/http/configuration/config.xml =================================================================== --- trunk/http/configuration/config.xml 2008-08-23 20:58:22 UTC (rev 240) +++ trunk/http/configuration/config.xml 2008-08-24 13:14:10 UTC (rev 241) @@ -3,33 +3,19 @@ <channel> <categorie name="explorateur"> <souscat name="films_defaut"> - <name> - Dossiers o&ugrave; le scanner doit chercher vos - vid&eacute;os. Le premier de la liste sera le - dossier par d&eacute;faut de l'explorateur de - films. - </name> + <name>Dossiers o&ugrave; le scanner doit chercher vos vid&eacute;os. Le premier de la liste sera le dossier par d&eacute;faut de l'explorateur de films.</name> <type>navigateur</type> <defaut1>c:/</defaut1> <defaut2>/</defaut2> </souscat> <souscat name="photos_defaut"> - <name> - Dossier des photos par d&eacute;faut. Le premier - de la liste sera le dossier par d&eacute;faut de - l'explorateur de photos. - </name> + <name>Dossier des photos par d&eacute;faut. Le premier de la liste sera le dossier par d&eacute;faut de l'explorateur de photos.</name> <type>navigateur</type> <defaut1>c:/</defaut1> <defaut2>/</defaut2> </souscat> <souscat name="audio_defaut"> - <name> - Dossiers o&ugrave; le scanner doit chercher vos - fichiers audios. Le premier de la liste sera le - dossier par d&eacute;faut de l'explorateur - audio. - </name> + <name>Dossiers o&ugrave; le scanner doit chercher vos fichiers audios. Le premier de la liste sera le dossier par d&eacute;faut de l'explorateur audio.</name> <type>navigateur</type> <defaut1>c:/</defaut1> <defaut2>/</defaut2> @@ -41,100 +27,60 @@ <defaut2>/mnt/cdrom</defaut2> </souscat> <souscat name="ext"> - <name> - Extensions interpr&eacute;t&eacute;es comme - des fichiers vid&eacute;os par Easy-Box - </name> + <name>Extensions interpr&eacute;t&eacute;es comme des fichiers vid&eacute;os par Easy-Box</name> <type>text</type> - <defaut> - .avi,.mpg,.mpeg,.mkv,.ogg,.wmv,.wma,.mp4,.3gp,.mov - </defaut> + <defaut>.avi,.mpg,.mpeg,.mkv,.ogg,.wmv,.wma,.mp4,.3gp,.mov,.flv</defaut> </souscat> <souscat name="ext_photo"> - <name> - Extensions interpr&eacute;t&eacute;es comme - des photos par Easy-Box - </name> + <name>Extensions interpr&eacute;t&eacute;es comme des photos par Easy-Box</name> <type>text</type> <defaut>.jpg,.gif,.bmp,.jpeg,.png</defaut> </souscat> <souscat name="ext_audio"> - <name> - Extensions interpr&eacute;t&eacute;es comme - des fichiers audios par Easy-Box - </name> + <name>Extensions interpr&eacute;t&eacute;es comme des fichiers audios par Easy-Box</name> <type>text</type> <defaut>.mp3,.ogg,.wma,.cda,.m3u,.wav</defaut> </souscat> <souscat name="afficher_fichier_cache"> - <name> - Afficher les fichiers cach&eacute;s dans les - explorateurs - </name> + <name>Afficher les fichiers cach&eacute;s dans les explorateurs</name> <type>boolean</type> <defaut>non</defaut> </souscat> <souscat name="proxy"> - <name> - Proxy pour les connexions aux net par Easybox - </name> + <name>Proxy pour les connexions aux net par Easybox</name> <type>text</type> <defaut></defaut> </souscat> <souscat name="proxyport"> - <name> - Port du proxy pour les connexions aux net par Easybox - </name> + <name>Port du proxy pour les connexions aux net par Easybox</name> <type>text</type> <defaut></defaut> </souscat> </categorie> <categorie name="scan"> <souscat name="nettoyer"> - <name> - Chaines de caract&egrave;res - supprim&eacute;es dans le nom des films pour une - recherche plus ais&eacute;e d'information sur - internet. Ex : "James.Bond.cd1.avi" deviendra - "James.Bond..avi". - </name> + <name>Chaines de caract&egrave;res supprim&eacute;es dans le nom des films pour une recherche plus ais&eacute;e d'information sur internet. Ex : "James.Bond.cd1.avi" deviendra "James.Bond..avi".</name> <type>text</type> - <defaut> - cd1,cd2,divx,dvdrip,_,FRENCH,VOSTFR,Vostfr - </defaut> + <defaut>cd1,cd2,divx,dvdrip,_,FRENCH,VOSTFR,Vostfr</defaut> </souscat> - <souscat name="afficher_personnes"> - <name> - Afficher les fiches des personnalit&eacute;s. - </name> + <name>Afficher les fiches des personnalit&eacute;s.</name> <type>boolean</type> <defaut>oui</defaut> </souscat> <souscat name="ext_noscan"> - <name> - Ne pas traiter les r&eacute;pertoires dont le - nom contient une des valeurs suivantes lors des - scans : tout dossier contenant une de ces chaines - sera volontairement oubli�. - </name> + <name>Ne pas traiter les r&eacute;pertoires dont le nom contient une des valeurs suivantes lors des scans : tout dossier contenant une de ces chaines de charact\xE8re sera volontairement oubli&eacute;.</name> <type>text</type> <defaut>NOSCAN</defaut> </souscat> </categorie> <categorie name="multimedia"> <souscat name="qualiteaudio"> - <name> - Quelle qualit&eacute; audio voulez-vous utiliser - ? - </name> + <name>Quelle qualit&eacute; audio voulez-vous utiliser ?</name> <type>options</type> <option> <choix> - <nom> - Son transcod&eacute;e - (St&eacute;r&eacute;o) - </nom> + <nom>Son transcod&eacute;e (St&eacute;r&eacute;o)</nom> <titre>Stereo</titre> </choix> <choix> @@ -168,29 +114,13 @@ <defaut>Aucun</defaut> </souscat> <souscat name="compensation"> - <name> - Permet de d&eacute;caler la bande son pour - qu'elle commence apr&egrave;s la - vid&eacute;o (&agrave; utiliser quand le son - sort de la carte son du PC et que le son est - d&eacute;cal&eacute; sinon mettre - &agrave; 0) (en millisecondes) - </name> + <name>Permet de d&eacute;caler la bande son pour qu'elle commence apr&egrave;s la vid&eacute;o (&agrave; utiliser quand le son sort de la carte son du PC et que le son est d&eacute;cal&eacute; sinon mettre &agrave; 0) (en millisecondes)</name> <type>text</type> <typeplus>numeric</typeplus> <defaut>0</defaut> </souscat> <souscat name="qualite"> - <name> - Selectionnez ici le profil de qualit&eacute; de - VLC. Le profil "Wifi et ordinateurs moyens" permet - d'&eacute;conomiser - l&eacute;g&agrave;rement le processeur et - les d&eacute;bits au d&eacute;triment de la - qualit&eacute;. Le profil "Wifi difficile et - ordinateurs peu puissants" appuie encore ce - ph&eacute;nom&agrave;ne. - </name> + <name>Selectionnez ici le profil de qualit&eacute; de VLC. Le profil "Wifi et ordinateurs moyens" permet d'&eacute;conomiser l&eacute;g&agrave;rement le processeur et les d&eacute;bits au d&eacute;triment de la qualit&eacute;. Le profil "Wifi difficile et ordinateurs peu puissants" appuie encore ce ph&eacute;nom&agrave;ne.</name> <type>options</type> <option> <choix> @@ -202,9 +132,7 @@ <titre>play-wifi.html</titre> </choix> <choix> - <nom> - Wifi difficile et ordinateurs peu puissants - </nom> + <nom>Wifi difficile et ordinateurs peu puissants</nom> <titre>play-low.html</titre> </choix> </option> @@ -220,32 +148,17 @@ </categorie> <categorie name="download"> <souscat name="patch"> - <name> - Chemin o&ugrave; sont stock&eacute;es les - mises &agrave; jour - </name> + <name>Chemin o&ugrave; sont stock&eacute;es les mises &agrave; jour</name> <type>text</type> - <defaut> - http://www.easybox-freeplayer.com/modules/addon/ - </defaut> + <defaut>http://www.easybox-freeplayer.com/modules/addon/</defaut> </souscat> <souscat name="xml"> - <name> - Chemin vers le fichier listant les mises - &agrave; jour - </name> + <name>Chemin vers le fichier listant les mises &agrave; jour</name> <type>text</type> - <defaut> - http://www.easybox-freeplayer.com/genxml.php - </defaut> + <defaut>http://www.easybox-freeplayer.com/genxml.php</defaut> </souscat> <souscat name="maj"> - <name> - Voulez-vous qu'Easybox se mette &agrave; jour - automatiquement ? (Il est fortement - d&eacute;conseill&eacute; de - d&eacute;sactiver cette option) - </name> + <name>Voulez-vous qu'Easybox se mette &agrave; jour automatiquement ? (Il est fortement d&eacute;conseill&eacute; de d&eacute;sactiver cette option)</name> <type>boolean</type> <defaut>oui</defaut> </souscat> @@ -306,10 +219,7 @@ </categorie> <categorie name="modules"> <souscat name="afficher_categories"> - <name> - Afficher les cat&eacute;gories dans le menu - principal. - </name> + <name>Afficher les cat&eacute;gories dans le menu principal.</name> <type>boolean</type> <defaut>oui</defaut> </souscat> Modified: trunk/http/configuration/configuration.php =================================================================== --- trunk/http/configuration/configuration.php 2008-08-23 20:58:22 UTC (rev 240) +++ trunk/http/configuration/configuration.php 2008-08-24 13:14:10 UTC (rev 241) @@ -1,3 +1,8 @@ +<?php +header("Cache-Control: no-cache, must-revalidate"); +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +?> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> <html> <head> Modified: trunk/http/configuration/general.php =================================================================== --- trunk/http/configuration/general.php 2008-08-23 20:58:22 UTC (rev 240) +++ trunk/http/configuration/general.php 2008-08-24 13:14:10 UTC (rev 241) @@ -19,7 +19,7 @@ } } -echo '<div class="titrerec titrereclarger"><div class="coin gh"> </div><div class="titre titrelarger" id="titre">'.$titre.'</div><div class="coin dh"> </div></div><div class="res2">'; +echo '<div class="titrerec titrereclarger"><div class="coin gh"> </div><div class="titre titrelarger" id="titre">'.$titre.'</div><div class="coin dh"> </div></div><div class="res2"><form action="" autocomplete="off">'; $j = 0; // Affichage des champs du formulaire @@ -52,7 +52,7 @@ // Cas d'un mot de passe case 'password': ($typeplus=='numeric'?$num="onKeypress=\"if(event.keyCode > 31 && (event.keyCode < 45 || event.keyCode > 57)) event.returnValue = false; if(event.which > 31 && (event.which < 45 || event.which > 57)) return false;\"":$num=""); - echo '<input name="'.$catnom.'|'.$nom.'" id="'.$catnom.'|'.$nom.'" type="password" autocomplete="off" '.$num.' size="'.(strlen(htmlspecialchars($entry))+5).'" value="'.$entry.'"><script language="javascript">setTimeout("document.getElementById(\''.$catnom.'|'.$nom.'\').value = \''.$entry.'\';",50);</script>'; + echo '<input name="'.$catnom.'|'.$nom.'" id="'.$catnom.'|'.$nom.'" type="password" autocomplete="off" '.$num.' size="'.(strlen(htmlspecialchars($entry))+5).'" value="'.$entry.'">'; $js .= 'set_ini("'.$catnom.'","'.$nom.'",document.getElementById("'.$catnom.'|'.$nom.'").value);'; break; @@ -141,7 +141,7 @@ ($typeplus=='numeric'?$num="onKeypress=\"if(event.keyCode > 31 && (event.keyCode < 45 || event.keyCode > 57)) event.returnValue = false; if(event.which > 31 && (event.which < 45 || event.which > 57)) return false;\"":$num=""); echo '<input name="'.$catnom.'|'.$nom.'" id="'.$catnom.'|'.$nom.'" type="text" autocomplete="off" '.$num.' size="'; echo strlen(htmlspecialchars($entry))+10; - echo '" value="'.$entry.'"><script language="javascript">setTimeout("document.getElementById(\''.$catnom.'|'.$nom.'\').value = \''.$entry.'\';",50);</script><br>'; + echo '" value="'.$entry.'"><br>'; $js .= 'set_ini("'.$catnom.'","'.$nom.'",document.getElementById("'.$catnom.'|'.$nom.'").value);'; break; @@ -155,7 +155,7 @@ } } } - echo '</div><div class="titrerecb titrerecblarger"><div class="coin gb"> </div><div class="titre titrelarger"> </div><div class="coin db"> </div></div>'; + echo '</form></div><div class="titrerecb titrerecblarger"><div class="coin gb"> </div><div class="titre titrelarger"> </div><div class="coin db"> </div></div>'; echo '<script language="javascript">function save(){suc=0;'.$js.'}function addsucces(){suc=suc+1;if(suc=='.$total.'){alert("Configuration enregistr\xE9e avec succ\xE8s");}}</script>'; Modified: trunk/http/configuration/script.js =================================================================== --- trunk/http/configuration/script.js 2008-08-23 20:58:22 UTC (rev 240) +++ trunk/http/configuration/script.js 2008-08-24 13:14:10 UTC (rev 241) @@ -163,7 +163,6 @@ function ajouter2(){ if ((addchamp != '')&&(addurl != '')) { - var addchamp = document.getElementById("addnom"); var addurl = document.getElementById("addurl"); var objListe = document.getElementById("listpodcast"); @@ -176,7 +175,6 @@ } } - function add(rep){ var obj = document.getElementById(idNom); if (obj.type=="text"){ @@ -186,7 +184,6 @@ objListe.options[objListe.length] = new Option(rep,rep,false,false); maj(idNom); } - cacher_dir("explor"); } @@ -211,12 +208,11 @@ obj.submit(); } - //////////////////////////////////////////////////////////////////////////////// ////////////////////- Gestion du fichier configuration.ini -//////////////////// //////////////////////////////////////////////////////////////////////////////// -// Assigne une valeur \xE0 une cl du fichier configuration.ini +// Assigne une valeur \xE0 une cle du fichier configuration.ini function set_ini(cle,entree,val){ var xhr = getXhr(); var ok = 0; @@ -224,6 +220,8 @@ if(xhr.readyState == 4 && xhr.status == 200){ if(xhr.responseText==''){ addsucces(); + }else{ + set_ini(cle,entree,val); } } } @@ -848,4 +846,4 @@ } xhr.open("GET","delpodcast.php?id=" + currentpodcastid + "&al=" + Math.random(),true); xhr.send(null); -} \ No newline at end of file +} Modified: trunk/http/module/VOD/classes/debug.txt =================================================================== --- trunk/http/module/VOD/classes/debug.txt 2008-08-23 20:58:22 UTC (rev 240) +++ trunk/http/module/VOD/classes/debug.txt 2008-08-24 13:14:10 UTC (rev 241) @@ -1,9 +1,9 @@ HTTP/1.0 302 Moved Temporarily -Date: Sat, 23 Aug 2008 16:42:53 GMT +Date: Sat, 23 Aug 2008 21:28:00 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 +Set-Cookie: wt=expires%3D1219527000%7Eaccess%3D%2F2%2FFLV-320x240%2F53%2F49%2F435349.flv%7Emd5%3Dd3b0f4ea20ccfc0c85ddfbc16c51baa1; path=/; domain=.wat.tv +Location: http://wdk.wat.tv/2/FLV-320x240/53/49/435349.flv Content-Length: 0 Content-Type: text/html X-Cache: MISS from kuzh.polytechnique.fr @@ -12,15 +12,15 @@ HTTP/1.0 200 OK Content-Type: video/x-flv -ETag: "1844399291" +ETag: "2587458518" Accept-Ranges: bytes -Last-Modified: Fri, 08 Aug 2008 18:06:58 GMT -Content-Length: 2548286 +Last-Modified: Tue, 16 Oct 2007 14:25:41 GMT +Content-Length: 24448814 Server: BustaWS/2.0 -Expires: Sat, 23 Aug 2008 16:42:53 GMT +Expires: Sat, 23 Aug 2008 21:28:00 GMT Cache-Control: max-age=0, no-cache Pragma: no-cache -Date: Sat, 23 Aug 2008 16:42:53 GMT +Date: Sat, 23 Aug 2008 21:28:00 GMT X-Cache: MISS from kuzh.polytechnique.fr Via: 1.0 kuzh.polytechnique.fr:8080 (squid) Proxy-Connection: keep-alive Modified: trunk/http/module/VOD/classes/player_proxy_wat.php =================================================================== --- trunk/http/module/VOD/classes/player_proxy_wat.php 2008-08-23 20:58:22 UTC (rev 240) +++ trunk/http/module/VOD/classes/player_proxy_wat.php 2008-08-24 13:14:10 UTC (rev 241) @@ -1,8 +1,10 @@ <?php -$RACINE_REP = '../../'; +$RACINE_REP = '../../../'; define('LIBRARIES_REP', $RACINE_REP.'/_framework/lib/'); +define('USER', $RACINE_REP.'/_utilisateur/'); require_once(LIBRARIES_REP.'Ini.class.php'); + $ini_class = new INI(USER.'configuration.ini'); set_time_limit(3600); @@ -224,7 +226,6 @@ if($envoi) echo $buff; - usleep(1000); } } Deleted: trunk/http/out.txt =================================================================== --- trunk/http/out.txt 2008-08-23 20:58:22 UTC (rev 240) +++ trunk/http/out.txt 2008-08-24 13:14:10 UTC (rev 241) @@ -1,2 +0,0 @@ -last line : "\xE3ć\xD86Lή\x82\xABYl\x90p\x9BZ?!+o՚\x8E\xB7[\x9E3\xD7D\xC2j\xC0+b\xAC\xC72\xAF\xAE\xE4[,\xA1\xEC -" \ No newline at end of file Modified: trunk/http/testing.php =================================================================== --- trunk/http/testing.php 2008-08-23 20:58:22 UTC (rev 240) +++ trunk/http/testing.php 2008-08-24 13:14:10 UTC (rev 241) @@ -1,5 +1,266 @@ <?php -var_dump($momo = 'idiot'); +$RACINE_REP = '../http/'; +define('LIBRARIES_REP', $RACINE_REP.'/_framework/lib/'); +define('USER', $RACINE_REP.'/_utilisateur/'); +require_once(LIBRARIES_REP.'Ini.class.php'); +$ini_class = new INI(USER.'configuration.ini'); + +set_time_limit(3600); +class Http { + /*Code de retour */ + public $statusCode; + /*Contenu renvoyé */ + public $htmlContents; + /*Headers */ + public $httpHeaders; + /*Limite de redirections */ + public $maxRedirects = 0; + /*Timeout de réception d'un paquet */ + public $httpTimeout = 5; + + function __construct(){ + } + + /*Requête Get + * + @param string $url URL \xC3 charger + @param string $queryString Chaîne contenant les paramètres \xC3 passer \xC3 la requête + @return boolean Résultat de la requête (true = 200 OK) + **/ + function get($url, $queryString = '', $sCookie = ''){ + return $this->request($url, 'GET', $queryString, $sCookie); + } + + /*Requête Post + * + @param string $url URL \xC3 charger + @param string $queryString Chaîne contenant les paramètres \xC3 passer \xC3 la requête + @return boolean Résultat de la requête (true = 200 OK) + **/ + function post($url, $queryString = '', $sCookie = ''){ + return $this->request($url, 'POST', $queryString, $sCookie); + } + + /*Requête Principale + * + @param string $url URL \xC3 charger + @param string $queryString Chaîne contenant les paramètres \xC3 passer \xC3 la requête + @param string $requestType Type de la requête (GET/POST) + @return boolean Résultat de la requête (true = 200 OK) + **/ + function request($url, $requestType = 'GET', $queryString = '', $sCookie = '', $envoi=false){ + global $ini; + $this->statusCode = 0; + $this->htmlContents = ''; + $this->httpHeaders = array('Set-Cookie' => array()); + + /*Explosion de l'URL */ + $parsedUrl = parse_url($url); + if (!isset($parsedUrl['path']) || $parsedUrl['path'] === ''){ + $parsedUrl['path'] = '/'; + } + /*Zut, on a passé une partie des infos dans l'url ! */ + if (isset($parsedUrl['query']) && $parsedUrl['query'] !== ''){ + if ($requestType === 'GET'){ + if ($queryString !== ''){ + $queryString .= '&'; + } + $queryString .= $parsedUrl['query']; + }else{ + $parsedUrl['path'] = $parsedUrl['path'].'?'.$parsedUrl['query']; + } + } + echo $ini['explorateur']['proxy']; + if($ini['explorateur']['proxy']){ + $fp = @fsockopen($ini['explorateur']['proxy'], $ini['explorateur']['proxyport'], $errno, $errstr, 50); + }else{ + $fp = @fsockopen($parsedUrl['host'], 80, $errno, $errstr, 5); + } + + if (!$fp) return false; + if ($requestType === 'GET'){ + if($ini['explorateur']['proxy']){ + fputs($fp, "GET ".$url." HTTP/1.1\r\nHost: ".$parsedUrl['host']."\r\n"); + }else{ + fputs($fp, "GET ".$parsedUrl['path'].($queryString != '' ? '?'.$queryString : '')." HTTP/1.1\r\nHost: ".$parsedUrl['host']."\r\n"); + } + + if ($sCookie !== ''){ + fputs($fp, "Cookie: $sCookie\r\n"); + } + fputs($fp, "Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8\r\n"); + fputs($fp, "User-Agent: Mozilla/5.0 (Windows; U; Windows NT 6.0; fr; rv:1.9.0.1) Gecko/2008070208 Firefox/3.0.1\r\n"); + fputs($fp, "Accept-Language: fr,fr-fr;q=0.8,en-us;q=0.5,en;q=0.3\r\n"); + fputs($fp, "Accept-Charset: ISO-8859-1,utf-8;q=0.7,*;q=0.7\r\n"); + fputs($fp, "Accept-Encoding: gzip,deflate\r\n"); + fputs($fp, "Keep-Alive: 300\r\n"); + fputs($fp, "Proxy-Connection: keep-alive\r\n\r\n"); + }elseif ($requestType === 'POST'){ + if($ini['explorateur']['proxy']){ + fputs($fp, "POST ".$url." HTTP/1.1\r\nHost: ".$parsedUrl['host']."\r\n"); + }else{ + fputs($fp, "POST ".$parsedUrl['path']." HTTP/1.1\r\nHost: ".$parsedUrl['host']."\r\n"); + } + if ($sCookie !== '') + { + fputs($fp, "Cookie: $sCookie\r\n"); + } + fputs($fp, "Mozilla/5.0 (Windows; U; Windows NT 6.0; fr; rv:1.9.0.1) Gecko/2008070208 Firefox/3.0.1\r\n"); + fputs($fp, "Content-Type: application/x-www-form-urlencoded\r\n"); + fputs($fp, "Content-Length: ".strlen($queryString)."\r\n"); + fputs($fp, "Accept-Encoding: gzip,deflate"); + fputs($fp, "Connection: close\r\n\r\n"); + fputs($fp, $queryString); + }else{ + return false; + } + + + $buffer = ''; + /*Time out de lecture */ + stream_set_timeout($fp, 1000); + /*Lecture des headers */ + while (!feof($fp)){ + $buffer = fgets($fp, 4096); + + if ($buffer === false){ + return false; + } + $buffer = trim($buffer); + + file_put_contents('debug.txt',file_get_contents('debug.txt')."\n".$buffer); + + if($envoi){ + header('HTTP/1.0 200 OK'); + header('Content-Type: video/x-flv'); + header('Accept-Ranges: bytes'); + } + if (substr($buffer, 0, 7) === 'HTTP/1.'){ + $this->statusCode = (int) substr($buffer, 9, 3); + }else{ + $colonPos = strpos($buffer, ':'); + if ($colonPos !== false){ + $headerName = substr($buffer, 0, $colonPos); + if ($headerName === 'Set-Cookie'){ + $this->httpHeaders[$headerName][] = substr($buffer, $colonPos + 2); + }else{ + $this->httpHeaders[$headerName] = substr($buffer, $colonPos + 2); + } + } + } + if ($buffer == '' && $this->statusCode !== 0) break; + } + + /*Redirection 301 ou 302 */ + if (($this->statusCode === 302 || $this->statusCode === 301) && isset($this->httpHeaders['Location']) && $this->maxRedirects-- > 0){ + $newUrl = parse_url($this->httpHeaders['Location']); + if (!isset($newUrl['path'])){ + $newUrl['path'] = ''; + }else{ + $newUrl['path'] = ltrim($newUrl['path'], '/'); + } + if (!isset($newUrl['host'])){ + $newUrl['host'] = $parsedUrl['host']; + } + if (!isset($newUrl['query'])){ + $newUrl['query'] = ''; + } + return $this->request('http://'.$newUrl['host'].'/'.$newUrl['path'], $requestType, $newUrl['query'], $sCookie); + } + /*On remet \xC3 3 le nombre max de redirections */ + $this->maxRedirects = 0; + + $buffer = ''; + + if (isset($this->httpHeaders['Transfer-Encoding']) && $this->httpHeaders['Transfer-Encoding'] === 'chunked'){ + /*Fichier chunked */ + while (!feof($fp)){ + $length = fgets($fp, 1024); + if ($length === false){ + return false; + } + + $length = hexdec(trim($length)); + if($length===0){ + break; + } + + while ($length > 0){ + $buff = fgets($fp, $length + 1); + if ($buff === false) + { + return false; + } + $length -= strlen($buff); + $buffer .= $buff; + + } + fgets($fp,1024); + } + }elseif (isset($this->httpHeaders['Content-Length'])){ + //Fichier avec Content-Length + $length = (int) $this->httpHeaders['Content-Length']; + + while ($length > 0){ + $buff = fgets($fp, $length+1); + if ($buff === false) + { + break; + } + $length -= strlen($buff); + $buffer .= $buff; + + if($envoi) + echo $buff; + } + }else{ + /*Fichier sans Content-Length ni chunk */ + while (!feof($fp)) + { + $buff = fgets($fp, 4096); + if ($buff === false){ + break; + } + $buffer .= $buff; + } + + } + fclose($fp); + + /*Le contenu est-il gzippé ? */ + if (isset($this->httpHeaders['Content-Encoding']) && ($this->httpHeaders['Content-Encoding'] === 'gzip' || $this->httpHeaders['Content-Encoding'] === 'deflate')) + { + if ($this->httpHeaders['Content-Encoding'] === 'gzip') + { + $buffer = substr($buffer, 10); + } + $this->htmlContents = gzinflate($buffer); + if ($this->htmlContents === false) + { + return false; + } + } + else + { + $this->htmlContents = $buffer; + } + return $this->statusCode === 200; + } +} + +$id = $_GET['id']; +file_put_contents('debug.txt',''); +$http = new Http(); +$http->request('http://proxy-29.deezer.com/rewrite/3TxkwS6o8fR8tUBgDQX2sEcsTXcOGy1U/c65bd73a44ae440555df65e6730c88de/27cadb8454719cc73f53d7bc036ba6e45616671fe0fb13ab2d49618a674cc57c50ae476dfdaf19645c3ec075d7ca193b3936266a99ff2c0a11f9711df8c81f65/a5924fd5ab69191ef72bb1b54b7f22cb372dd9453e84277d60b212d1ec190c99d73381edce44375774e3735c2eb9327275834491b31c872acacdd77e406bdc53/9,0,124,0/','GET','__utma=253676188.2225138453119332600.1214129550.1219416520.1219525133.108; __utmz=253676188.1214919665.4.3.utmcsr=google|utmccn=(organic)|utmcmd=organic|utmctr=deezer; __utmb=253676188.31.10.1219525133; __utmc=253676188'); + +print_r($http->httpHeaders); +file_put_contents('debug.txt',$http->htmlContents); +//echo $http->htmlContents; +//echo $cookie[0]; + +//$h = $http->request(($http->htmlContents?$http->htmlContents:$http->httpHeaders['Location']), 'GET', '', $cookie[0], true); +//file_put_contents('out.mp4', $http->htmlContents); + ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
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. |
From: <ara...@us...> - 2008-08-23 17:11:44
|
Revision: 239 http://easybox-mod.svn.sourceforge.net/easybox-mod/?rev=239&view=rev Author: aragornis Date: 2008-08-23 17:11:35 +0000 (Sat, 23 Aug 2008) Log Message: ----------- Suppression des icones pour les renvoyer sans majuscules Noms des icones mis en minuscule Le module wat devrait ?\195?\160 peu pres marcher : ?\195?\160 tester L'API photo remarche avec les fichiers locaux Modified Paths: -------------- trunk/http/_framework/lib/Photo.class.php trunk/http/_utilisateur/contentVLC trunk/http/http-vlc/player.html trunk/http/module/VOD/classes/player_proxy_wat.php trunk/http/module/_menu/menu.php Removed Paths: ------------- trunk/http/skin/mediacenter/icones/Ma Musique.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 Modified: trunk/http/_framework/lib/Photo.class.php =================================================================== --- trunk/http/_framework/lib/Photo.class.php 2008-08-23 16:44:30 UTC (rev 238) +++ trunk/http/_framework/lib/Photo.class.php 2008-08-23 17:11:35 UTC (rev 239) @@ -129,12 +129,17 @@ }else{ $RemoteDL = new RemoteDL($this->url); $RemoteDL->set_cache_time(0); - if($data = $RemoteDL->file_get_contents()){ + if(!($data = $RemoteDL->file_get_contents())){ + if(file_exists($this->url)){ + $data = file_get_contents($this->url); + } + } + + if($data){ $this->img = imagecreatefromstring($data); $this->width = imagesx($this->img); $this->height = imagesy($this->img); - $trans = imagecolortransparent($this->img); if($trans!=-1){ $this->couleur_fond = imagecolorsforindex($this->img,$trans); Modified: trunk/http/_utilisateur/contentVLC =================================================================== --- trunk/http/_utilisateur/contentVLC 2008-08-23 16:44:30 UTC (rev 238) +++ trunk/http/_utilisateur/contentVLC 2008-08-23 17:11:35 UTC (rev 239) @@ -19,15 +19,10 @@ - - - - - -|00:00:00|fake:|00:00:04|playing|C:\Program Files\Easyboxv3\http\skin\mediacenter\background\bg.png +|00:00:00|current_node_url|00:00:04|playing|current_node_name Modified: trunk/http/http-vlc/player.html =================================================================== --- trunk/http/http-vlc/player.html 2008-08-23 16:44:30 UTC (rev 238) +++ trunk/http/http-vlc/player.html 2008-08-23 17:11:35 UTC (rev 239) @@ -1,3 +1,3 @@ <vlc id="rpn" param1="vlc_stop" /> <vlc id="rpn" param1="playlist_empty" /> -<vlc id="rpn" param1="'fake: :fake-file=C:\\\\Program Files\\\\Easyboxv3\\\\http\\\\skin\\\\mediacenter\\\\background\\\\bg.png :fake-width=720 :fake-height=576 :fake-aspect-ratio=4:3 :fake-duration=4000 :sout=#transcode{acodec=mpga,ab=128,channels=2,samplerate=44100,vcodec=mp2v,vb=1024,fps=25.,soverlay=1}:duplicate{dst=std{access=udp,mux=ts,dst=212.27.38.253:1234}}' 'C:\\Program Files\\Easyboxv3\\http\\skin\\mediacenter\\background\\bg.png' playlist_add vlc_play" /> +<vlc id="rpn" param1="'fake: :fake-file=C:\\\\Program Files\\\\Easyboxv3\\\\http\\\\skin\\\\mediacenter\\\\background\\\\bg.png :fake-width=720 :fake-height=576 :fake-aspect-ratio=4:3 :fake-duration=4000 :sout=#transcode{acodec=mpga,ab=128,channels=2,samplerate=44100,vcodec=mp2v,vb=1024,fps=25.,soverlay=1}:duplicate{dst=display,dst=std{access=udp,mux=ts,dst=212.27.38.253:1234}}' 'C:\\Program Files\\Easyboxv3\\http\\skin\\mediacenter\\background\\bg.png' playlist_add vlc_play" /> Modified: trunk/http/module/VOD/classes/player_proxy_wat.php =================================================================== --- trunk/http/module/VOD/classes/player_proxy_wat.php 2008-08-23 16:44:30 UTC (rev 238) +++ trunk/http/module/VOD/classes/player_proxy_wat.php 2008-08-23 17:11:35 UTC (rev 239) @@ -1,8 +1,12 @@ <?php +$RACINE_REP = '../../'; +define('LIBRARIES_REP', $RACINE_REP.'/_framework/lib/'); +require_once(LIBRARIES_REP.'Ini.class.php'); +$ini_class = new INI(USER.'configuration.ini'); + set_time_limit(3600); -class Http -{ +class Http { /*Code de retour */ public $statusCode; /*Contenu renvoyé */ @@ -14,8 +18,7 @@ /*Timeout de réception d'un paquet */ public $httpTimeout = 5; - function __construct() - { + function __construct(){ } /*Requête Get @@ -24,8 +27,7 @@ @param string $queryString Chaîne contenant les paramètres \xC3 passer \xC3 la requête @return boolean Résultat de la requête (true = 200 OK) **/ - function get($url, $queryString = '', $sCookie = '') - { + function get($url, $queryString = '', $sCookie = ''){ return $this->request($url, 'GET', $queryString, $sCookie); } @@ -35,8 +37,7 @@ @param string $queryString Chaîne contenant les paramètres \xC3 passer \xC3 la requête @return boolean Résultat de la requête (true = 200 OK) **/ - function post($url, $queryString = '', $sCookie = '') - { + function post($url, $queryString = '', $sCookie = ''){ return $this->request($url, 'POST', $queryString, $sCookie); } @@ -47,42 +48,43 @@ @param string $requestType Type de la requête (GET/POST) @return boolean Résultat de la requête (true = 200 OK) **/ - function request($url, $requestType = 'GET', $queryString = '', $sCookie = '', $envoi=false) - { + function request($url, $requestType = 'GET', $queryString = '', $sCookie = '', $envoi=false){ + global $ini; $this->statusCode = 0; $this->htmlContents = ''; $this->httpHeaders = array('Set-Cookie' => array()); /*Explosion de l'URL */ $parsedUrl = parse_url($url); - if (!isset($parsedUrl['path']) || $parsedUrl['path'] === '') - { + if (!isset($parsedUrl['path']) || $parsedUrl['path'] === ''){ $parsedUrl['path'] = '/'; } /*Zut, on a passé une partie des infos dans l'url ! */ - if (isset($parsedUrl['query']) && $parsedUrl['query'] !== '') - { - if ($requestType === 'GET') - { - if ($queryString !== '') - { + if (isset($parsedUrl['query']) && $parsedUrl['query'] !== ''){ + if ($requestType === 'GET'){ + if ($queryString !== ''){ $queryString .= '&'; } $queryString .= $parsedUrl['query']; - } - else - { + }else{ $parsedUrl['path'] = $parsedUrl['path'].'?'.$parsedUrl['query']; } } + if($ini['explorateur']['proxy']){ + $fp = @fsockopen($ini['explorateur']['proxy'], $ini['explorateur']['proxyport'], $errno, $errstr, 50); + }else{ + $fp = @fsockopen($parsedUrl['host'], 80, $errno, $errstr, 5); + } - $fp = @fsockopen($parsedUrl['host'], 80, $errno, $errstr, 5); if (!$fp) return false; - if ($requestType === 'GET') - { - fputs($fp, "GET ".$parsedUrl['path'].($queryString != '' ? '?'.$queryString : '')." HTTP/1.1\r\nHost: ".$parsedUrl['host']."\r\n"); - if ($sCookie !== '') - { + if ($requestType === 'GET'){ + if($ini['explorateur']['proxy']){ + fputs($fp, "GET ".$url." HTTP/1.1\r\nHost: ".$parsedUrl['host']."\r\n"); + }else{ + fputs($fp, "GET ".$parsedUrl['path'].($queryString != '' ? '?'.$queryString : '')." HTTP/1.1\r\nHost: ".$parsedUrl['host']."\r\n"); + } + + if ($sCookie !== ''){ fputs($fp, "Cookie: $sCookie\r\n"); } fputs($fp, "Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8\r\n"); @@ -92,10 +94,12 @@ fputs($fp, "Accept-Encoding: gzip,deflate\r\n"); fputs($fp, "Keep-Alive: 300\r\n"); fputs($fp, "Connection: keep-alive\r\n\r\n"); - } - elseif ($requestType === 'POST') - { - fputs($fp, "POST ".$parsedUrl['path']." HTTP/1.1\r\nHost: ".$parsedUrl['host']."\r\n"); + }elseif ($requestType === 'POST'){ + if($ini['explorateur']['proxy']){ + fputs($fp, "POST ".$url." HTTP/1.1\r\nHost: ".$parsedUrl['host']."\r\n"); + }else{ + fputs($fp, "POST ".$parsedUrl['path']." HTTP/1.1\r\nHost: ".$parsedUrl['host']."\r\n"); + } if ($sCookie !== '') { fputs($fp, "Cookie: $sCookie\r\n"); @@ -106,46 +110,39 @@ fputs($fp, "Accept-Encoding: gzip,deflate"); fputs($fp, "Connection: close\r\n\r\n"); fputs($fp, $queryString); - } - else - { + }else{ return false; } $buffer = ''; /*Time out de lecture */ - //stream_set_timeout($fp, 5); + stream_set_timeout($fp, 1000); /*Lecture des headers */ - while (!feof($fp)) - { + while (!feof($fp)){ $buffer = fgets($fp, 4096); - if ($buffer === false) - { + if ($buffer === false){ return false; } $buffer = trim($buffer); - if($envoi) - header($buffer); - if (substr($buffer, 0, 7) === 'HTTP/1.') - { - $this->statusCode = (int) substr($buffer, 9, 3); + file_put_contents('debug.txt',file_get_contents('debug.txt')."\n".$buffer); + + if($envoi){ + header('HTTP/1.0 200 OK'); + header('Content-Type: video/x-flv'); + header('Accept-Ranges: bytes'); } - else - { + if (substr($buffer, 0, 7) === 'HTTP/1.'){ + $this->statusCode = (int) substr($buffer, 9, 3); + }else{ $colonPos = strpos($buffer, ':'); - if ($colonPos !== false) - { + if ($colonPos !== false){ $headerName = substr($buffer, 0, $colonPos); - if ($headerName === 'Set-Cookie') - { + if ($headerName === 'Set-Cookie'){ $this->httpHeaders[$headerName][] = substr($buffer, $colonPos + 2); - } - else - { - + }else{ $this->httpHeaders[$headerName] = substr($buffer, $colonPos + 2); } } @@ -154,23 +151,17 @@ } /*Redirection 301 ou 302 */ - if (($this->statusCode === 302 || $this->statusCode === 301) && isset($this->httpHeaders['Location']) && $this->maxRedirects-- > 0) - { + if (($this->statusCode === 302 || $this->statusCode === 301) && isset($this->httpHeaders['Location']) && $this->maxRedirects-- > 0){ $newUrl = parse_url($this->httpHeaders['Location']); - if (!isset($newUrl['path'])) - { + if (!isset($newUrl['path'])){ $newUrl['path'] = ''; - } - else - { + }else{ $newUrl['path'] = ltrim($newUrl['path'], '/'); } - if (!isset($newUrl['host'])) - { + if (!isset($newUrl['host'])){ $newUrl['host'] = $parsedUrl['host']; } - if (!isset($newUrl['query'])) - { + if (!isset($newUrl['query'])){ $newUrl['query'] = ''; } return $this->request('http://'.$newUrl['host'].'/'.$newUrl['path'], $requestType, $newUrl['query'], $sCookie); @@ -179,24 +170,21 @@ $this->maxRedirects = 0; $buffer = ''; - if (isset($this->httpHeaders['Transfer-Encoding']) && $this->httpHeaders['Transfer-Encoding'] === 'chunked') - { + + if (isset($this->httpHeaders['Transfer-Encoding']) && $this->httpHeaders['Transfer-Encoding'] === 'chunked'){ /*Fichier chunked */ - while (!feof($fp)) - { + while (!feof($fp)){ $length = fgets($fp, 1024); - if ($length === false) - { + if ($length === false){ return false; } $length = hexdec(trim($length)); - if($length===0) - { + if($length===0){ break; } - while ($length > 0) - { + + while ($length > 0){ $buff = fgets($fp, $length + 1); if ($buff === false) { @@ -207,53 +195,36 @@ } fgets($fp,1024); - } - } - elseif (isset($this->httpHeaders['Content-Length'])) - { - + }elseif (isset($this->httpHeaders['Content-Length']) AND !$envoi){ //Fichier avec Content-Length $length = (int) $this->httpHeaders['Content-Length']; - while ($length > 0) - { - if($envoi) - $buff = fgets($fp, 4096); - else + while ($length > 0){ $buff = fgets($fp, $length+1); - if ($buff === false) { break; - } + } $length -= strlen($buff); $buffer .= $buff; - + if($envoi) echo $buff; - } - - - } - - else - { + }else{ /*Fichier sans Content-Length ni chunk */ while (!feof($fp)) { - $buff = fgets($fp, 1024); - if ($buff === false) - { + $buff = fgets($fp, 4096); + if ($buff === false){ break; - } + $buffer .= $buff; if($envoi) echo $buff; - - + usleep(1000); } } @@ -281,18 +252,21 @@ } $id = $_GET['id']; - +file_put_contents('debug.txt',''); $http = new Http(); $http->request('http://www.wat.tv/get/5c396b7d6c541c946bb25bbdf3ee6e7a/488ee20e/2/FLV-320x240/'.substr($id, -4, 2).'/'.substr($id, -2).'/'.$id.'.flv','GET','getURL=1&c='.$id.'&d=1&member=1868631551&end=0&fs=0&cnt=0&version=WIN%209,0,124,0'); -/* http://www.wat.tv/get/d09e0cdbdd405685df9b2bcefdcc4932/488ecfe3/2/FLV-320x240/34/69/1353469.flv?getURL=1&c=1353469&d=1&member=1868631551&end=0&fs=0&cnt=0&version=WIN%209,0,124,0 +/* http://www.wat.tv/get/d09e0cdbdd405685df9b2bcefdcc4932/488ecfe3/2/FLV-320x240/34/69/1353469.flv?getURL=1&c=1353469&d=1&member=1868631551&end=0&fs=0&cnt=0&version=WIN%209,0,124,0 + http://www.wat.tv/get/d09e0cdbdd405685df9b2bcefdcc4932/488ecfe3/2/FLV-320x240/34/69/1353469.flv?getURL=1&c=1353469&d=1&member=1868631551&end=0&fs=0&cnt=0&version=WIN%209,0,124,0 http://www.wat.tv/get/2ff6c3c7fa09416a3c1573671c0da083/488ed038/2/FLV-320x240/15/71/1291571.flv?getURL=1&c=1291571&d=1&member=1868631551&end=0&fs=0&cnt=0&version=WIN%209,0,124,0 */ $cookie = explode(';', $http->httpHeaders['Set-Cookie'][0]); + //echo $http->htmlContents; //echo $cookie[0]; -$h = $http->request($http->htmlContents, 'GET', '', $cookie[0], true); + +$h = $http->request(($http->htmlContents?$http->htmlContents:$http->httpHeaders['Location']), 'GET', '', $cookie[0], true); //file_put_contents('out.mp4', $http->htmlContents); ?> Modified: trunk/http/module/_menu/menu.php =================================================================== --- trunk/http/module/_menu/menu.php 2008-08-23 16:44:30 UTC (rev 238) +++ trunk/http/module/_menu/menu.php 2008-08-23 17:11:35 UTC (rev 239) @@ -15,9 +15,9 @@ foreach($res as $k => $r){ if($r['dependance']=='Alone'){ - $image = RES_ICO.str_replace(array('>',' !',' ','\xE9','\xEE','\xF4','\xE0','\xE8'),array('','','','e','i','o','a','e'),$r['nom']).'.gif'; + $image = RES_ICO.strtolower(str_replace(array('>',' !',' ','\xE9','\xEE','\xF4','\xE0','\xE8'),array('','','','e','i','o','a','e'),$r['nom'])).'.gif'; }else{ - $image = ICONE_REP.str_replace(array('>',' !',' ','\xE9','\xEE','\xF4','\xE0','\xE8'),array('','','','e','i','o','a','e'),$r['nom']).'.gif'; + $image = ICONE_REP.strtolower(str_replace(array('>',' !',' ','\xE9','\xEE','\xF4','\xE0','\xE8'),array('','','','e','i','o','a','e'),$r['nom'])).'.gif'; } $resultats[] = new ItemMenu($r['nom'], MODULE.$r['repertoire'].$r['lien'], $image, ''); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ara...@us...> - 2008-08-23 16:44:33
|
Revision: 238 http://easybox-mod.svn.sourceforge.net/easybox-mod/?rev=238&view=rev Author: aragornis Date: 2008-08-23 16:44:30 +0000 (Sat, 23 Aug 2008) Log Message: ----------- Adaptation de l'API de transformation d'image au module de connexion au web (proxy) Modified Paths: -------------- trunk/http/_framework/lib/Photo.class.php trunk/http/_framework/lib/RemoteDL.class.php Modified: trunk/http/_framework/lib/Photo.class.php =================================================================== --- trunk/http/_framework/lib/Photo.class.php 2008-08-23 15:01:35 UTC (rev 237) +++ trunk/http/_framework/lib/Photo.class.php 2008-08-23 16:44:30 UTC (rev 238) @@ -1,8 +1,14 @@ <?php -$RACINE_REP = realpath('../../'); -define('CACHE_IMAGE', $RACINE_REP.'/_utilisateur/cache/'); +$RACINE_REP = '../../'; +define('CACHE_IMAGE', realpath($RACINE_REP).'/_utilisateur/cache/'); define('LIBRARIES_REP', $RACINE_REP.'/_framework/lib/'); +define('USER', $RACINE_REP.'_utilisateur/'); + +require_once(LIBRARIES_REP.'RemoteDL.class.php'); +require_once(LIBRARIES_REP.'Ini.class.php'); +$ini_class = new INI(USER.'configuration.ini'); + class image { // Adresse de l'image @@ -121,7 +127,9 @@ readfile($this->name_cache); // Sinon on charge l'image et on execute les demandes }else{ - if($data = file_get_contents($this->url)){ + $RemoteDL = new RemoteDL($this->url); + $RemoteDL->set_cache_time(0); + if($data = $RemoteDL->file_get_contents()){ $this->img = imagecreatefromstring($data); $this->width = imagesx($this->img); $this->height = imagesy($this->img); @@ -161,7 +169,7 @@ // Fonction d'erreur function error(){ - + echo 'erreur'; } // Fonction trouvant le bon argument entre 0 et 360 Modified: trunk/http/_framework/lib/RemoteDL.class.php =================================================================== --- trunk/http/_framework/lib/RemoteDL.class.php 2008-08-23 15:01:35 UTC (rev 237) +++ trunk/http/_framework/lib/RemoteDL.class.php 2008-08-23 16:44:30 UTC (rev 238) @@ -91,8 +91,10 @@ }else{ if($this->url_validate()){ $retour = file_get_contents($this->url,null,$this->get_context()); - file_put_contents(CACHE_IMAGE.$this->md5, $retour); - sqlite_query($db,'INSERT INTO cache VALUES(NULL,\''.sqlite_escape_string($this->md5).'\', \''.(time()+$this->cache_time).'\')'); + if($this->cache_time>0){ + file_put_contents(CACHE_IMAGE.$this->md5, $retour); + sqlite_query($db,'INSERT INTO cache VALUES(NULL,\''.sqlite_escape_string($this->md5).'\', \''.(time()+$this->cache_time).'\')'); + } }else{ return false; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ara...@us...> - 2008-08-23 15:01:43
|
Revision: 237 http://easybox-mod.svn.sourceforge.net/easybox-mod/?rev=237&view=rev Author: aragornis Date: 2008-08-23 15:01:35 +0000 (Sat, 23 Aug 2008) Log Message: ----------- Possibilit?\195?\169 de faire fonctionner Easybox derri?\195?\168re un proxy Passage de tous les acces d'Easybox ?\195?\160 internet par la m?\195?\170me fonction pour centraliser les options de connexion (par exemple le passage par un proxy) Ajout de la configuration d'un proxy dans le panneau de configuration Am?\195?\169lioration de la classe d'acc?\195?\168s au web (v?\195?\169rification rapide de l'existence de la page) Modified Paths: -------------- trunk/http/_framework/fonctions_partagees.inc.php trunk/http/_framework/lib/RemoteDL.class.php trunk/http/_utilisateur/contentVLC trunk/http/configuration/config.xml trunk/http/module/VOD/classes/player_proxy_wat.php trunk/http/testing.php Modified: trunk/http/_framework/fonctions_partagees.inc.php =================================================================== --- trunk/http/_framework/fonctions_partagees.inc.php 2008-08-22 20:38:22 UTC (rev 236) +++ trunk/http/_framework/fonctions_partagees.inc.php 2008-08-23 15:01:35 UTC (rev 237) @@ -7,13 +7,13 @@ } function couper_colonnes($string, $largeur, $lignes){ - $nom = wordwrap($string,$largeur,'<br>',false); - $pieces = explode('<br>', $nom); - $res = ''; - for($i=0;$i<($lignes-1);$i++){ - $res .= $pieces[$i].'<br>'; - } - return $res.$pieces[$lignes-1]; + $nom = wordwrap($string,$largeur,'<br>',false); + $pieces = explode('<br>', $nom); + $res = ''; + for($i=0;$i<($lignes-1);$i++){ + $res .= $pieces[$i].'<br>'; + } + return $res.$pieces[$lignes-1]; } function convert_size($size){ @@ -46,25 +46,6 @@ reset($arr); } -//extraire d'un path le nom du fichier sans extension -function extract_name($fichier){ - $nomcourant = basename($fichier); - $nomcourant = trim(substr($nomcourant,0,strrpos($nomcourant,'.'))); - RETURN $nomcourant; -} - -// D\xE9finit le META['refresh'] -function set_refresh($time, $string, $bool=false){ - global $time_refresh, $cansetfrontpannel, $Easybox; - if($time_refresh>=$time OR !$time_refresh){ - $Easybox->meta('refresh', $string); - $time_refresh = $time; - if($bool){ - $cansetfrontpannel = !$bool; - } - } -} - function calcul_hours($temps){ $hours = floor($temps / 3600); $min = floor(($temps - ($hours * 3600)) / 60); @@ -246,15 +227,20 @@ break; } - $xml = simplexml_load_file($xml_file); - foreach($xml->element as $patch){ - download_file($ini['download']['patch'].$xml->element[0]->fichier, $RACINE_REP.$plus); - change_version($module, $xml->element[0]->version); - $DONE[] = array($xml->element[0]->version, $xml->element[0]->nom); - } + $RemoteDL = new RemoteDL($xml_file); + if($xml = $RemoteDL->simplexml_load_file()){ - return $DONE; + foreach($xml->element as $patch){ + download_file($ini['download']['patch'].$xml->element[0]->fichier, $RACINE_REP.$plus); + change_version($module, $xml->element[0]->version); + $DONE[] = array($xml->element[0]->version, $xml->element[0]->nom); + } + + return $DONE; + }else{ + return array(); + } } function get_all_maj(){ @@ -286,7 +272,9 @@ } // R\xE9cuperation du fichier - $fdownload = file_get_contents($file); + $RemoteDL = new RemoteDL($file); + $fdownload = $RemoteDL->file_get_contents(); + file_put_contents('temp.zip', $fdownload); // Suppression des anciens fichiers - Pour eviter des bugs @@ -305,7 +293,7 @@ } } - //// On d\xE9zipe les fichiers + // On d\xE9zipe les fichiers $archive = new PclZip('temp.zip'); if ($archive->extract(PCLZIP_OPT_ADD_PATH, $dest_dir) == 0) { die("Erreur : ".$archive->errorInfo(true)); @@ -315,7 +303,7 @@ copy(realpath($dest_dir).'/icone.gif', realpath(RES_ICO).'/'.str_replace(array('>',' !',' ','\xE9','\xEE','\xF4'),array('','','','e','i','o'),$name).'.gif'); } - //// On supprime le fichier temporaire + // On supprime le fichier temporaire unlink("temp.zip"); } @@ -363,12 +351,16 @@ $xml_file = $ini['download']['xml'].'?cat=Patch&needed1='.$module.'&needed2='.$version; - $xml = simplexml_load_file($xml_file); - $count = 0; - foreach($xml->element as $el){ - $count++; + $RemoteDL = new RemoteDL($xml_file); + if($xml = $RemoteDL->simplexml_load_file()){ + $count = 0; + foreach($xml->element as $el){ + $count++; + } + return $count > 0; + }else{ + return false; } - return $count > 0; } function strip_delimiters($input){ @@ -454,9 +446,11 @@ } function add_download($name){ - echo @file_get_contents('http://www.easybox-mod.org/add_dl.php?name='.$name); + $RemoteDL = new RemoteDL($feed['add']); + $xml = $RemoteDL->file_get_contents(); } +// Cr\xE9e un bouton utilis\xE9 dans le panneau de configuration function gen_bouton($caption, $fct_js,$class_normal, $class_over){ return '<span OnMouseOut="change_class(this,\''.$class_normal.'\');" OnMouseOver="change_class(this,\''.$class_over.'\');" OnClick="'.$fct_js.'" class="'.$class_normal.'">'.$caption.'</span>'; } @@ -470,12 +464,4 @@ return $output; } -// Teste si une constante est d\xE9finie et renvoie sa valeur si oui et une valeur par d\xE9faut sinon -function skin_constante($cte, $default){ - if(defined($cte)){ - return constant($cte); - }else{ - return $default; - } -} ?> Modified: trunk/http/_framework/lib/RemoteDL.class.php =================================================================== --- trunk/http/_framework/lib/RemoteDL.class.php 2008-08-22 20:38:22 UTC (rev 236) +++ trunk/http/_framework/lib/RemoteDL.class.php 2008-08-23 15:01:35 UTC (rev 237) @@ -4,6 +4,7 @@ var $url = ''; var $md5 = ''; var $cache_time = 3600; + var $context = null; function __construct($url){ $this->url = $url; @@ -14,8 +15,26 @@ $this->cache_time = $heures*3600; } + function get_context(){ + global $ini; + if($this->context){ + $context = $this->context; + if($ini['explorateur']['proxy']){ + $context['http']['proxy'] = 'tcp://'.$ini['explorateur']['proxy'].':'.$ini['explorateur']['proxyport']; + } + }else{ + if($ini['explorateur']['proxy']){ + $context = array('http' => array('proxy' => 'tcp://'.$ini['explorateur']['proxy'].':'.$ini['explorateur']['proxyport'], 'request_fulluri' => true)); + }else{ + return null; + } + } + return stream_context_create($context); + } + // V\xE9rifie la validit\xE9 de url function url_validate(){ + global $ini; $url_parts = @parse_url($this->url); if(!$url_parts or empty($url_parts["host"])){ @@ -36,11 +55,21 @@ $port = $url_parts["port"]; if(empty($port )) $port = "80"; - $socket = @fsockopen( $host, $port, $errno, $errstr, 30 ); + + if($ini['explorateur']['proxy']){ + $socket = @fsockopen(($ini['explorateur']['proxy']?$ini['explorateur']['proxy']:$host), ($ini['explorateur']['proxy']?($ini['explorateur']['proxyport']?$ini['explorateur']['proxyport']:8080):$host), $errno, $errstr, 2 ); + }else{ + $socket = @fsockopen( $host, $port, $errno, $errstr, 2 ); + } + if (!$socket){ return false; }else{ - fwrite ($socket, "HEAD ".$documentpath." HTTP/1.0\r\nHost: $host\r\n\r\n"); + if($ini['explorateur']['proxy']){ + fwrite ($socket, "HEAD ".$this->url." HTTP/1.0\r\nHost: $host\r\n\r\n"); + }else{ + fwrite ($socket, "HEAD ".$documentpath." HTTP/1.0\r\nHost: $host\r\n\r\n"); + } $http_response = fgets( $socket, 22 ); if( ereg("200 OK", $http_response, $regs)){ @@ -53,24 +82,28 @@ } // T\xE9l\xE9charge une page internet et la met en cache ou r\xE9cup\xE8re directement son contenu mis en cache - function file_get_contents($context=null){ + function file_get_contents(){ $db = sqlite_open(USER.'cache.db', 0666); self::clean_cache(); $res = sqlite_query($db,'SELECT * FROM cache WHERE fichier="'.$this->md5.'"'); if(sqlite_num_rows($res)>0 AND file_exists(CACHE_IMAGE.$this->md5)){ $retour = file_get_contents(CACHE_IMAGE.$this->md5); }else{ - $retour = file_get_contents($this->url,null,$context); - file_put_contents(CACHE_IMAGE.$this->md5, $retour); - sqlite_query($db,'INSERT INTO cache VALUES(NULL,\''.sqlite_escape_string($this->md5).'\', \''.(time()+$this->cache_time).'\')'); + if($this->url_validate()){ + $retour = file_get_contents($this->url,null,$this->get_context()); + file_put_contents(CACHE_IMAGE.$this->md5, $retour); + sqlite_query($db,'INSERT INTO cache VALUES(NULL,\''.sqlite_escape_string($this->md5).'\', \''.(time()+$this->cache_time).'\')'); + }else{ + return false; + } } sqlite_close($db); return $retour; } // Ouvre un fichier xml en le mettant en cache - function simplexml_load_file($context=null){ - return simplexml_load_string($this->file_get_contents($context)); + function simplexml_load_file(){ + return simplexml_load_string($this->file_get_contents()); } // Nettoie les fichiers p\xE9rim\xE9s du cache Modified: trunk/http/_utilisateur/contentVLC =================================================================== --- trunk/http/_utilisateur/contentVLC 2008-08-22 20:38:22 UTC (rev 236) +++ trunk/http/_utilisateur/contentVLC 2008-08-23 15:01:35 UTC (rev 237) @@ -30,4 +30,4 @@ -|00:00:00|fake:|00:00:04|stop|C:\Program Files\Easyboxv3\http\skin\mediacenter\background\bg.png +|00:00:00|fake:|00:00:04|playing|C:\Program Files\Easyboxv3\http\skin\mediacenter\background\bg.png Modified: trunk/http/configuration/config.xml =================================================================== --- trunk/http/configuration/config.xml 2008-08-22 20:38:22 UTC (rev 236) +++ trunk/http/configuration/config.xml 2008-08-23 15:01:35 UTC (rev 237) @@ -1,220 +1,318 @@ <?xml version = '1.0' encoding = 'iso-8859-1'?> -<rss version="2.0" > - <channel> - <categorie name="explorateur" > - <souscat name="films_defaut" > - <name>Dossiers o&ugrave; le scanner doit chercher vos vid&eacute;os. Le premier de la liste sera le dossier par d&eacute;faut de l'explorateur de films.</name> - <type>navigateur</type> - <defaut1>c:/</defaut1> - <defaut2>/</defaut2> - </souscat> - <souscat name="photos_defaut" > - <name>Dossier des photos par d&eacute;faut. Le premier de la liste sera le dossier par d&eacute;faut de l'explorateur de photos.</name> - <type>navigateur</type> - <defaut1>c:/</defaut1> - <defaut2>/</defaut2> - </souscat> - <souscat name="audio_defaut" > - <name>Dossiers o&ugrave; le scanner doit chercher vos fichiers audios. Le premier de la liste sera le dossier par d&eacute;faut de l'explorateur audio.</name> - <type>navigateur</type> - <defaut1>c:/</defaut1> - <defaut2>/</defaut2> - </souscat> - <souscat name="dvd" > - <name>Lettre de votre lecteur DVD</name> - <type>dvd</type> - <defaut1>d:</defaut1> - <defaut2>/mnt/cdrom</defaut2> - </souscat> - <souscat name="ext" > - <name>Extensions interpr&eacute;t&eacute;es comme des fichiers vid&eacute;os par Easy-Box</name> - <type>text</type> - <defaut>.avi,.mpg,.mpeg,.mkv,.ogg,.wmv,.wma,.mp4,.3gp,.mov</defaut> - </souscat> - <souscat name="ext_photo" > - <name>Extensions interpr&eacute;t&eacute;es comme des photos par Easy-Box</name> - <type>text</type> - <defaut>.jpg,.gif,.bmp,.jpeg,.png</defaut> - </souscat> - <souscat name="ext_audio" > - <name>Extensions interpr&eacute;t&eacute;es comme des fichiers audios par Easy-Box</name> - <type>text</type> - <defaut>.mp3,.ogg,.wma,.cda,.m3u,.wav</defaut> - </souscat> +<rss version="2.0"> + <channel> + <categorie name="explorateur"> + <souscat name="films_defaut"> + <name> + Dossiers o&ugrave; le scanner doit chercher vos + vid&eacute;os. Le premier de la liste sera le + dossier par d&eacute;faut de l'explorateur de + films. + </name> + <type>navigateur</type> + <defaut1>c:/</defaut1> + <defaut2>/</defaut2> + </souscat> + <souscat name="photos_defaut"> + <name> + Dossier des photos par d&eacute;faut. Le premier + de la liste sera le dossier par d&eacute;faut de + l'explorateur de photos. + </name> + <type>navigateur</type> + <defaut1>c:/</defaut1> + <defaut2>/</defaut2> + </souscat> + <souscat name="audio_defaut"> + <name> + Dossiers o&ugrave; le scanner doit chercher vos + fichiers audios. Le premier de la liste sera le + dossier par d&eacute;faut de l'explorateur + audio. + </name> + <type>navigateur</type> + <defaut1>c:/</defaut1> + <defaut2>/</defaut2> + </souscat> + <souscat name="dvd"> + <name>Lettre de votre lecteur DVD</name> + <type>dvd</type> + <defaut1>d:</defaut1> + <defaut2>/mnt/cdrom</defaut2> + </souscat> + <souscat name="ext"> + <name> + Extensions interpr&eacute;t&eacute;es comme + des fichiers vid&eacute;os par Easy-Box + </name> + <type>text</type> + <defaut> + .avi,.mpg,.mpeg,.mkv,.ogg,.wmv,.wma,.mp4,.3gp,.mov + </defaut> + </souscat> + <souscat name="ext_photo"> + <name> + Extensions interpr&eacute;t&eacute;es comme + des photos par Easy-Box + </name> + <type>text</type> + <defaut>.jpg,.gif,.bmp,.jpeg,.png</defaut> + </souscat> + <souscat name="ext_audio"> + <name> + Extensions interpr&eacute;t&eacute;es comme + des fichiers audios par Easy-Box + </name> + <type>text</type> + <defaut>.mp3,.ogg,.wma,.cda,.m3u,.wav</defaut> + </souscat> + <souscat name="afficher_fichier_cache"> + <name> + Afficher les fichiers cach&eacute;s dans les + explorateurs + </name> + <type>boolean</type> + <defaut>non</defaut> + </souscat> + <souscat name="proxy"> + <name> + Proxy pour les connexions aux net par Easybox + </name> + <type>text</type> + <defaut></defaut> + </souscat> + <souscat name="proxyport"> + <name> + Port du proxy pour les connexions aux net par Easybox + </name> + <type>text</type> + <defaut></defaut> + </souscat> + </categorie> + <categorie name="scan"> + <souscat name="nettoyer"> + <name> + Chaines de caract&egrave;res + supprim&eacute;es dans le nom des films pour une + recherche plus ais&eacute;e d'information sur + internet. Ex : "James.Bond.cd1.avi" deviendra + "James.Bond..avi". + </name> + <type>text</type> + <defaut> + cd1,cd2,divx,dvdrip,_,FRENCH,VOSTFR,Vostfr + </defaut> + </souscat> - <souscat name="afficher_fichier_cache" > - <name>Afficher les fichiers cach&eacute;s dans les explorateurs</name> - <type>boolean</type> - <defaut>non</defaut> - </souscat> - </categorie> - <categorie name="scan" > - <souscat name="nettoyer" > - <name>Chaines de caract&egrave;res supprim&eacute;es dans le nom des films pour une recherche plus ais&eacute;e d'information sur internet. Ex : "James.Bond.cd1.avi" deviendra "James.Bond..avi".</name> - <type>text</type> - <defaut>cd1,cd2,divx,dvdrip,_,FRENCH,VOSTFR,Vostfr</defaut> - </souscat> - - <souscat name="afficher_personnes" > - <name>Afficher les fiches des personnalit&eacute;s.</name> - <type>boolean</type> - <defaut>oui</defaut> - </souscat> - <souscat name="ext_noscan" > - <name>Ne pas traiter les r&eacute;pertoires dont le nom contient une des valeurs suivantes lors des scans : tout dossier contenant une de ces chaines sera volontairement oubli�.</name> - <type>text</type> - <defaut>NOSCAN</defaut> - </souscat> - </categorie> - <categorie name="multimedia" > - <souscat name="qualiteaudio" > - <name>Quelle qualit&eacute; audio voulez-vous utiliser ?</name> - <type>options</type> - <option> - <choix> - <nom>Son transcod&eacute;e (St&eacute;r&eacute;o)</nom> - <titre>Stereo</titre> - </choix> - <choix> - <nom>Son non-transcod&eacute; (AC3)</nom> - <titre>AC3</titre> - </choix> - </option> - <defaut>Stereo</defaut> - </souscat> - <souscat name="sortieordi" > - <name>Voulez-vous afficher le flux sur le PC ?</name> - <type>options</type> - <option> - <choix> - <nom>Aucun</nom> - <titre>none</titre> - </choix> - <choix> - <nom>Son seulement</nom> - <titre>audio</titre> - </choix> - <choix> - <nom>Video seulement</nom> - <titre>video</titre> - </choix> - <choix> - <nom>Tout</nom> - <titre>all</titre> - </choix> - </option> - <defaut>Aucun</defaut> - </souscat> - <souscat name="compensation" > - <name>Permet de d&eacute;caler la bande son pour qu'elle commence apr&egrave;s la vid&eacute;o (&agrave; utiliser quand le son sort de la carte son du PC et que le son est d&eacute;cal&eacute; sinon mettre &agrave; 0) (en millisecondes)</name> - <type>text</type> - <typeplus>numeric</typeplus> - <defaut>0</defaut> - </souscat> - <souscat name="qualite" > - <name>Selectionnez ici le profil de qualit&eacute; de VLC. Le profil "Wifi et ordinateurs moyens" permet d'&eacute;conomiser l&eacute;g&agrave;rement le processeur et les d&eacute;bits au d&eacute;triment de la qualit&eacute;. Le profil "Wifi difficile et ordinateurs peu puissants" appuie encore ce ph&eacute;nom&agrave;ne.</name> - <type>options</type> - <option> - <choix> - <nom>Normal</nom> - <titre>play.html</titre> - </choix> - <choix> - <nom>Wifi et ordinateurs moyens</nom> - <titre>play-wifi.html</titre> - </choix> - <choix> - <nom>Wifi difficile et ordinateurs peu puissants</nom> - <titre>play-low.html</titre> - </choix> - </option> - <defaut>play.html</defaut> - </souscat> - </categorie> - <categorie name="skin" > - <souscat name="skin" > - <name>Skin par defaut</name> - <type>hidden</type> - <defaut>Mediacenter</defaut> - </souscat> - </categorie> - <categorie name="download" > - <souscat name="patch" > - <name>Chemin o&ugrave; sont stock&eacute;es les mises &agrave; jour</name> - <type>text</type> - <defaut>http://www.easybox-freeplayer.com/modules/addon/</defaut> - </souscat> - <souscat name="xml" > - <name>Chemin vers le fichier listant les mises &agrave; jour</name> - <type>text</type> - <defaut>http://www.easybox-freeplayer.com/genxml.php</defaut> - </souscat> - <souscat name="maj" > - <name>Voulez-vous qu'Easybox se mette &agrave; jour automatiquement ? (Il est fortement d&eacute;conseill&eacute; de d&eacute;sactiver cette option)</name> - <type>boolean</type> - <defaut>oui</defaut> - </souscat> - </categorie> - <categorie name="demarrage" > - <souscat name="demarrage" > - <name>Modifier la page de d&eacute;marrage</name> - <type>hidden</type> - <defaut>_menu/menu.php</defaut> - </souscat> - </categorie> - <categorie name="favoris" > - <souscat name="touche1" > - <name>Touche 1</name> - <type>telecomande</type> - <defaut>films/</defaut> - </souscat> - <souscat name="touche2" > - <name>Touche 2</name> - <type>telecomande</type> - <defaut>mp3/</defaut> - </souscat> - <souscat name="touche3" > - <name>Touche 3</name> - <type>telecomande</type> - <defaut>diaporama/</defaut> - </souscat> - <souscat name="touche4" > - <name>Touche 4</name> - <type>telecomande</type> - <defaut>guidetv/</defaut> - </souscat> - <souscat name="touche5" > - <name>Touche 5</name> - <type>telecomande</type> - <defaut>meteo/</defaut> - </souscat> - <souscat name="touche6" > - <name>Touche 6</name> - <type>telecomande</type> - <defaut>mail/</defaut> - </souscat> - <souscat name="touche7" > - <name>Touche 7</name> - <type>telecomande</type> - <defaut>jt/</defaut> - </souscat> - <souscat name="touche8" > - <name>Touche 8</name> - <type>telecomande</type> - <defaut>livescore/</defaut> - </souscat> - <souscat name="touche9" > - <name>Touche 9</name> - <type>telecomande</type> - <defaut>maj_mod/</defaut> - </souscat> - </categorie> - <categorie name="modules" > - <souscat name="afficher_categories" > - <name>Afficher les cat&eacute;gories dans le menu principal.</name> - <type>boolean</type> - <defaut>oui</defaut> - </souscat> - </categorie> - </channel> + <souscat name="afficher_personnes"> + <name> + Afficher les fiches des personnalit&eacute;s. + </name> + <type>boolean</type> + <defaut>oui</defaut> + </souscat> + <souscat name="ext_noscan"> + <name> + Ne pas traiter les r&eacute;pertoires dont le + nom contient une des valeurs suivantes lors des + scans : tout dossier contenant une de ces chaines + sera volontairement oubli�. + </name> + <type>text</type> + <defaut>NOSCAN</defaut> + </souscat> + </categorie> + <categorie name="multimedia"> + <souscat name="qualiteaudio"> + <name> + Quelle qualit&eacute; audio voulez-vous utiliser + ? + </name> + <type>options</type> + <option> + <choix> + <nom> + Son transcod&eacute;e + (St&eacute;r&eacute;o) + </nom> + <titre>Stereo</titre> + </choix> + <choix> + <nom>Son non-transcod&eacute; (AC3)</nom> + <titre>AC3</titre> + </choix> + </option> + <defaut>Stereo</defaut> + </souscat> + <souscat name="sortieordi"> + <name>Voulez-vous afficher le flux sur le PC ?</name> + <type>options</type> + <option> + <choix> + <nom>Aucun</nom> + <titre>none</titre> + </choix> + <choix> + <nom>Son seulement</nom> + <titre>audio</titre> + </choix> + <choix> + <nom>Video seulement</nom> + <titre>video</titre> + </choix> + <choix> + <nom>Tout</nom> + <titre>all</titre> + </choix> + </option> + <defaut>Aucun</defaut> + </souscat> + <souscat name="compensation"> + <name> + Permet de d&eacute;caler la bande son pour + qu'elle commence apr&egrave;s la + vid&eacute;o (&agrave; utiliser quand le son + sort de la carte son du PC et que le son est + d&eacute;cal&eacute; sinon mettre + &agrave; 0) (en millisecondes) + </name> + <type>text</type> + <typeplus>numeric</typeplus> + <defaut>0</defaut> + </souscat> + <souscat name="qualite"> + <name> + Selectionnez ici le profil de qualit&eacute; de + VLC. Le profil "Wifi et ordinateurs moyens" permet + d'&eacute;conomiser + l&eacute;g&agrave;rement le processeur et + les d&eacute;bits au d&eacute;triment de la + qualit&eacute;. Le profil "Wifi difficile et + ordinateurs peu puissants" appuie encore ce + ph&eacute;nom&agrave;ne. + </name> + <type>options</type> + <option> + <choix> + <nom>Normal</nom> + <titre>play.html</titre> + </choix> + <choix> + <nom>Wifi et ordinateurs moyens</nom> + <titre>play-wifi.html</titre> + </choix> + <choix> + <nom> + Wifi difficile et ordinateurs peu puissants + </nom> + <titre>play-low.html</titre> + </choix> + </option> + <defaut>play.html</defaut> + </souscat> + </categorie> + <categorie name="skin"> + <souscat name="skin"> + <name>Skin par defaut</name> + <type>hidden</type> + <defaut>Mediacenter</defaut> + </souscat> + </categorie> + <categorie name="download"> + <souscat name="patch"> + <name> + Chemin o&ugrave; sont stock&eacute;es les + mises &agrave; jour + </name> + <type>text</type> + <defaut> + http://www.easybox-freeplayer.com/modules/addon/ + </defaut> + </souscat> + <souscat name="xml"> + <name> + Chemin vers le fichier listant les mises + &agrave; jour + </name> + <type>text</type> + <defaut> + http://www.easybox-freeplayer.com/genxml.php + </defaut> + </souscat> + <souscat name="maj"> + <name> + Voulez-vous qu'Easybox se mette &agrave; jour + automatiquement ? (Il est fortement + d&eacute;conseill&eacute; de + d&eacute;sactiver cette option) + </name> + <type>boolean</type> + <defaut>oui</defaut> + </souscat> + </categorie> + <categorie name="demarrage"> + <souscat name="demarrage"> + <name>Modifier la page de d&eacute;marrage</name> + <type>hidden</type> + <defaut>_menu/menu.php</defaut> + </souscat> + </categorie> + <categorie name="favoris"> + <souscat name="touche1"> + <name>Touche 1</name> + <type>telecomande</type> + <defaut>films/</defaut> + </souscat> + <souscat name="touche2"> + <name>Touche 2</name> + <type>telecomande</type> + <defaut>mp3/</defaut> + </souscat> + <souscat name="touche3"> + <name>Touche 3</name> + <type>telecomande</type> + <defaut>diaporama/</defaut> + </souscat> + <souscat name="touche4"> + <name>Touche 4</name> + <type>telecomande</type> + <defaut>guidetv/</defaut> + </souscat> + <souscat name="touche5"> + <name>Touche 5</name> + <type>telecomande</type> + <defaut>meteo/</defaut> + </souscat> + <souscat name="touche6"> + <name>Touche 6</name> + <type>telecomande</type> + <defaut>mail/</defaut> + </souscat> + <souscat name="touche7"> + <name>Touche 7</name> + <type>telecomande</type> + <defaut>jt/</defaut> + </souscat> + <souscat name="touche8"> + <name>Touche 8</name> + <type>telecomande</type> + <defaut>livescore/</defaut> + </souscat> + <souscat name="touche9"> + <name>Touche 9</name> + <type>telecomande</type> + <defaut>maj_mod/</defaut> + </souscat> + </categorie> + <categorie name="modules"> + <souscat name="afficher_categories"> + <name> + Afficher les cat&eacute;gories dans le menu + principal. + </name> + <type>boolean</type> + <defaut>oui</defaut> + </souscat> + </categorie> + </channel> </rss> Modified: trunk/http/module/VOD/classes/player_proxy_wat.php =================================================================== --- trunk/http/module/VOD/classes/player_proxy_wat.php 2008-08-22 20:38:22 UTC (rev 236) +++ trunk/http/module/VOD/classes/player_proxy_wat.php 2008-08-23 15:01:35 UTC (rev 237) @@ -115,7 +115,7 @@ $buffer = ''; /*Time out de lecture */ - stream_set_timeout($fp, 5); + //stream_set_timeout($fp, 5); /*Lecture des headers */ while (!feof($fp)) { Modified: trunk/http/testing.php =================================================================== --- trunk/http/testing.php 2008-08-22 20:38:22 UTC (rev 236) +++ trunk/http/testing.php 2008-08-23 15:01:35 UTC (rev 237) @@ -1,289 +1,5 @@ <?php - -/** - * * Classe de requêtes HTTP - * * - * * @package Commons - * * - * * @author Yvan - * * @since 09/04/2005 - * **/ -set_time_limit(3600); -class Http -{ - /*Code de retour */ - public $statusCode; - /*Contenu renvoyé */ - public $htmlContents; - /*Headers */ - public $httpHeaders; - /*Limite de redirections */ - public $maxRedirects = 0; - /*Timeout de réception d'un paquet */ - public $httpTimeout = 5; - - function __construct() - { - } - - /*Requête Get - * - @param string $url URL \xC3 charger - @param string $queryString Chaîne contenant les paramètres \xC3 passer \xC3 la requête - @return boolean Résultat de la requête (true = 200 OK) - **/ - function get($url, $queryString = '', $sCookie = '') - { - return $this->request($url, 'GET', $queryString, $sCookie); - } - - /*Requête Post - * - @param string $url URL \xC3 charger - @param string $queryString Chaîne contenant les paramètres \xC3 passer \xC3 la requête - @return boolean Résultat de la requête (true = 200 OK) - **/ - function post($url, $queryString = '', $sCookie = '') - { - return $this->request($url, 'POST', $queryString, $sCookie); - } - - /*Requête Principale - * - @param string $url URL \xC3 charger - @param string $queryString Chaîne contenant les paramètres \xC3 passer \xC3 la requête - @param string $requestType Type de la requête (GET/POST) - @return boolean Résultat de la requête (true = 200 OK) - **/ - function request($url, $requestType = 'GET', $queryString = '', $sCookie = '', $envoi=false) - { - $this->statusCode = 0; - $this->htmlContents = ''; - $this->httpHeaders = array('Set-Cookie' => array()); - - /*Explosion de l'URL */ - $parsedUrl = parse_url($url); - if (!isset($parsedUrl['path']) || $parsedUrl['path'] === '') - { - $parsedUrl['path'] = '/'; - } - /*Zut, on a passé une partie des infos dans l'url ! */ - if (isset($parsedUrl['query']) && $parsedUrl['query'] !== '') - { - if ($requestType === 'GET') - { - if ($queryString !== '') - { - $queryString .= '&'; - } - $queryString .= $parsedUrl['query']; - } - else - { - $parsedUrl['path'] = $parsedUrl['path'].'?'.$parsedUrl['query']; - } - } - - $fp = @fsockopen($parsedUrl['host'], 80, $errno, $errstr, 10000); - if (!$fp) return false; - if ($requestType === 'GET') - { - fputs($fp, "GET ".$parsedUrl['path'].($queryString != '' ? '?'.$queryString : '')." HTTP/1.1\r\nHost: ".$parsedUrl['host']."\r\n"); - if ($sCookie !== '') - { - fputs($fp, "Cookie: $sCookie\r\n"); - } - fputs($fp, "Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8\r\n"); - fputs($fp, "User-Agent: Mozilla/5.0 (Windows; U; Windows NT 6.0; fr; rv:1.9.0.1) Gecko/2008070208 Firefox/3.0.1\r\n"); - fputs($fp, "Accept-Language: fr,fr-fr;q=0.8,en-us;q=0.5,en;q=0.3\r\n"); - fputs($fp, "Accept-Charset: ISO-8859-1,utf-8;q=0.7,*;q=0.7\r\n"); - fputs($fp, "Accept-Encoding: gzip,deflate\r\n"); - fputs($fp, "Keep-Alive: 300\r\n"); - fputs($fp, "Connection: keep-alive\r\n\r\n"); - } - elseif ($requestType === 'POST') - { - fputs($fp, "POST ".$parsedUrl['path']." HTTP/1.1\r\nHost: ".$parsedUrl['host']."\r\n"); - if ($sCookie !== '') - { - fputs($fp, "Cookie: $sCookie\r\n"); - } - fputs($fp, "User-Agent: Mozilla/5.0 (Windows; U; Windows NT 6.0; fr; rv:1.9.0.1) Gecko/2008070208 Firefox/3.0.1\r\n"); - fputs($fp, "Content-Type: application/x-www-form-urlencoded\r\n"); - fputs($fp, "Content-Length: ".strlen($queryString)."\r\n"); - fputs($fp, "Accept-Encoding: gzip,deflate"); - fputs($fp, "Connection: close\r\n\r\n"); - fputs($fp, $queryString); - } - else - { - return false; - } - - - $buffer = ''; - /*Time out de lecture */ - //stream_set_timeout($fp, 10000); - /*Lecture des headers */ - while (!feof($fp)) - { - $buffer = fgets($fp, 4096); - - if ($buffer === false) - { - return false; - } - $buffer = trim($buffer); - if($envoi) - header($buffer); - - if (substr($buffer, 0, 7) === 'HTTP/1.') - { - $this->statusCode = (int) substr($buffer, 9, 3); - } - else - { - $colonPos = strpos($buffer, ':'); - if ($colonPos !== false) - { - $headerName = substr($buffer, 0, $colonPos); - if ($headerName === 'Set-Cookie') - { - $this->httpHeaders[$headerName][] = substr($buffer, $colonPos + 2); - } - else - { - - $this->httpHeaders[$headerName] = substr($buffer, $colonPos + 2); - } - } - } - if ($buffer == '' && $this->statusCode !== 0) break; - } - - /*Redirection 301 ou 302 */ - if (($this->statusCode === 302 || $this->statusCode === 301) && isset($this->httpHeaders['Location']) && $this->maxRedirects-- > 0) - { - $newUrl = parse_url($this->httpHeaders['Location']); - if (!isset($newUrl['path'])) - { - $newUrl['path'] = ''; - } - else - { - $newUrl['path'] = ltrim($newUrl['path'], '/'); - } - if (!isset($newUrl['host'])) - { - $newUrl['host'] = $parsedUrl['host']; - } - if (!isset($newUrl['query'])) - { - $newUrl['query'] = ''; - } - return $this->request('http://'.$newUrl['host'].'/'.$newUrl['path'], $requestType, $newUrl['query'], $sCookie); - } - /*On remet \xC3 3 le nombre max de redirections */ - $this->maxRedirects = 0; - - $buffer = ''; - if (isset($this->httpHeaders['Transfer-Encoding']) && $this->httpHeaders['Transfer-Encoding'] === 'chunked') - { - /*Fichier chunked */ - while (!feof($fp)) - { - $length = fgets($fp, 1024); - if ($length === false) - { - return false; - } - - $length = hexdec(trim($length)); - if($length===0) - { - break; - } - while ($length > 0) - { - $buff = fgets($fp, $length + 1); - if ($buff === false) - { - return false; - } - $length -= strlen($buff); - $buffer .= $buff; - - } - fgets($fp,1024); - - } - } - /*elseif (isset($this->httpHeaders['Content-Length'])) - { - //Fichier avec Content-Length - $length = (int) $this->httpHeaders['Content-Length']; - while ($length > 0) - { - $buff = fgets($fp, $length + 1); - if ($buff === false) - { - return false; - } - $length -= strlen($buff); - $buffer .= $buff; - file_put_contents('out.txt', 'last line : "'.$buff.'"'); - - } - } - */ - else - { - /*Fichier sans Content-Length ni chunk */ - while (!feof($fp)) - { - $buff = fgets($fp, 1024); - if ($buff === false) - { - return false; - - } - - $buffer .= $buff; - if($envoi) - echo $buff; - - } - } - fclose($fp); - /*Le contenu est-il gzippé ? */ - if (isset($this->httpHeaders['Content-Encoding']) && ($this->httpHeaders['Content-Encoding'] === 'gzip' || $this->httpHeaders['Content-Encoding'] === 'deflate')) - { - if ($this->httpHeaders['Content-Encoding'] === 'gzip') - { - $buffer = substr($buffer, 10); - } - $this->htmlContents = gzinflate($buffer); - if ($this->htmlContents === false) - { - return false; - } - } - else - { - $this->htmlContents = $buffer; - } - return $this->statusCode === 200; - } -} - -$http = new Http(); -$http->request('http://www.wat.tv/get/5c7486d9d50dbb128eedf0c330a6c78f/488e17ba/2/FLV-320x240/99/77/1339977.flv','GET','getURL=1&c=1339977&d=1&member=1868631551&end=0&fs=0&cnt=0&version=WIN%209,0,124,0'); - -$cookie = explode(';', $http->httpHeaders['Set-Cookie'][0]); - -$h = $http->request($http->htmlContents, 'GET', '', $cookie[0], true); -file_put_contents('essai.mp4', $http->htmlContents); - +var_dump($momo = 'idiot'); ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ara...@us...> - 2008-08-22 20:38:28
|
Revision: 236 http://easybox-mod.svn.sourceforge.net/easybox-mod/?rev=236&view=rev Author: aragornis Date: 2008-08-22 20:38:22 +0000 (Fri, 22 Aug 2008) Log Message: ----------- Modified Paths: -------------- trunk/http/_utilisateur/contentVLC Added Paths: ----------- trunk/http/module/_options/ Removed Paths: ------------- trunk/http/module/modules/ Modified: trunk/http/_utilisateur/contentVLC =================================================================== --- trunk/http/_utilisateur/contentVLC 2008-08-21 21:41:46 UTC (rev 235) +++ trunk/http/_utilisateur/contentVLC 2008-08-22 20:38:22 UTC (rev 236) @@ -30,4 +30,4 @@ -|00:00:00|fake:|00:00:04|playing|C:\Program Files\Easyboxv3\http\skin\mediacenter\background\bg.png +|00:00:00|fake:|00:00:04|stop|C:\Program Files\Easyboxv3\http\skin\mediacenter\background\bg.png This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ara...@us...> - 2008-08-21 21:41:49
|
Revision: 235 http://easybox-mod.svn.sourceforge.net/easybox-mod/?rev=235&view=rev Author: aragornis Date: 2008-08-21 21:41:46 +0000 (Thu, 21 Aug 2008) Log Message: ----------- Added Paths: ----------- trunk/http/skin/mediacenter/icones/Ma Musique.gif Removed Paths: ------------- trunk/http/skin/mediacenter/icones/musique.gif Property changes on: trunk/http/skin/mediacenter/icones/Ma Musique.gif ___________________________________________________________________ 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. |
From: <ara...@us...> - 2008-08-21 21:38:27
|
Revision: 234 http://easybox-mod.svn.sourceforge.net/easybox-mod/?rev=234&view=rev Author: aragornis Date: 2008-08-21 21:38:24 +0000 (Thu, 21 Aug 2008) Log Message: ----------- Removed Paths: ------------- trunk/http/skin/mediacenter/icones/vod.gif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ara...@us...> - 2008-08-21 21:35:55
|
Revision: 233 http://easybox-mod.svn.sourceforge.net/easybox-mod/?rev=233&view=rev Author: aragornis Date: 2008-08-21 21:35:51 +0000 (Thu, 21 Aug 2008) Log Message: ----------- Removed Paths: ------------- trunk/http/skin/mediacenter/icones/mamusique.gif Deleted: trunk/http/skin/mediacenter/icones/mamusique.gif =================================================================== --- trunk/http/skin/mediacenter/icones/mamusique.gif 2008-08-21 21:16:12 UTC (rev 232) +++ trunk/http/skin/mediacenter/icones/mamusique.gif 2008-08-21 21:35:51 UTC (rev 233) @@ -1,4 +0,0 @@ -GIF89a( |
From: <ara...@us...> - 2008-08-20 21:40:22
|
Revision: 230 http://easybox-mod.svn.sourceforge.net/easybox-mod/?rev=230&view=rev Author: aragornis Date: 2008-08-20 21:40:17 +0000 (Wed, 20 Aug 2008) Log Message: ----------- TYPO sur interface.tpl Changement de l'icone de Ma Musique (?) Modified Paths: -------------- trunk/http/skin/mediacenter/interface.tpl Added Paths: ----------- trunk/http/skin/mediacenter/icones/mamusique.gif Added: trunk/http/skin/mediacenter/icones/mamusique.gif =================================================================== --- trunk/http/skin/mediacenter/icones/mamusique.gif (rev 0) +++ trunk/http/skin/mediacenter/icones/mamusique.gif 2008-08-20 21:40:17 UTC (rev 230) @@ -0,0 +1,4 @@ +GIF89a( |
From: <ara...@us...> - 2008-08-20 17:33:36
|
Revision: 228 http://easybox-mod.svn.sourceforge.net/easybox-mod/?rev=228&view=rev Author: aragornis Date: 2008-08-20 17:33:23 +0000 (Wed, 20 Aug 2008) Log Message: ----------- Possibilit?\195?\169 d'ajouter le tag "selected" ?\195?\160 un Item.Mosaique ou Item.liste : mise en valeur de l'?\195?\169l?\195?\169ment en question Mise en valeur de l'?\195?\169l?\195?\169ment en cours de lecture dans l'explorateur de fichiers (audio et vid?\195?\169o) Modified Paths: -------------- trunk/http/_framework/framework.php trunk/http/_framework/lib/Explorateur.class.php trunk/http/_framework/lib/Item.Liste.class.php trunk/http/_framework/lib/Item.Mosaique.class.php trunk/http/skin/mediacenter/item_liste.tpl trunk/http/skin/mediacenter/item_mosaique.tpl trunk/http/skin/mediacenter/sources/fond30x30.png Added Paths: ----------- trunk/http/skin/mediacenter/interface/fond30x30s.gif trunk/http/skin/mediacenter/interface/fond530x30s.gif trunk/http/skin/mediacenter/interface/fond90x130s.gif trunk/http/skin/mediacenter/sources/fond30x30s.png trunk/http/skin/mediacenter/sources/fond530x30s.png trunk/http/skin/mediacenter/sources/fond90x130s.png Removed Paths: ------------- trunk/http/_utilisateur/contentVLC Modified: trunk/http/_framework/framework.php =================================================================== --- trunk/http/_framework/framework.php 2008-08-20 16:49:17 UTC (rev 227) +++ trunk/http/_framework/framework.php 2008-08-20 17:33:23 UTC (rev 228) @@ -149,8 +149,6 @@ require_once(LIBRARIES_REP.'Explorateur.class.php'); //- D\xE9finition du menu par d\xE9faut -$Easybox->menu(MODULE.'_menu/menu.php', INTERFACE_REP.'easybox.gif', 'Easybox', 'Retour au menu principal', 5); - if(($VLC->play or $VLC->pause) AND $VLC->type=='video'){ $Easybox->menu(MODULE.'films/lecture.php', '', 'Cacher', 'Cacher', 201); $Easybox->menu(MODULE.'films/info.php', '', 'Lecteur', 'En cours...', 200); Modified: trunk/http/_framework/lib/Explorateur.class.php =================================================================== --- trunk/http/_framework/lib/Explorateur.class.php 2008-08-20 16:49:17 UTC (rev 227) +++ trunk/http/_framework/lib/Explorateur.class.php 2008-08-20 17:33:23 UTC (rev 228) @@ -63,7 +63,7 @@ } function lister_fichiers(){ - global $Easybox, $smarty; + global $Easybox, $smarty, $VLC; $this->rep = ($_GET['rep']!='' ? stripslashes(urldecode($_GET['rep'])) : $this->rep_par_defaut); @@ -91,11 +91,11 @@ break; case 'Video': - $resultats[] = new ItemMosaique($e['nom'], MODULE.'films/play.php?play='.urlencode($e['path']), 'image', ''); + $resultats[] = new ItemMosaique($e['nom'], MODULE.'films/play.php?play='.urlencode($e['path']), 'image', '', ($VLC->url == $e['path'])); break; case 'Audio': - $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']), 'image', '', ($VLC->url == $e['path'])); break; case 'Photo': @@ -109,11 +109,11 @@ break; case 'Video': - $resultats[] = new ItemListe($e['nom'], MODULE.'films/play.php?play='.urlencode($e['path']), INTERFACE_REP.'information.gif', MODULE.'films/fichefilm.php?film='.urlencode($e['nom_sans_extension']).'&fichier='.urlencode($e['path'])); + $resultats[] = new ItemListe($e['nom'], MODULE.'films/play.php?play='.urlencode($e['path']), INTERFACE_REP.'information.gif', MODULE.'films/fichefilm.php?film='.urlencode($e['nom_sans_extension']).'&fichier='.urlencode($e['path']), '', '', ($VLC->url == $e['path'])); break; case 'Audio': - $resultats[] = new ItemListe($e['nom'], $this->page_explorateur.'?rep='.urlencode($e['path']), INTERFACE_REP.'audio.gif', ''); + $resultats[] = new ItemListe($e['nom'], $this->page_explorateur.'?rep='.urlencode($e['path']), INTERFACE_REP.'audio.gif', '', '', '', ($VLC->url == $e['path'])); break; case 'Photo': @@ -122,7 +122,6 @@ break; } } - } $this->nb_elements = count($resultats); Modified: trunk/http/_framework/lib/Item.Liste.class.php =================================================================== --- trunk/http/_framework/lib/Item.Liste.class.php 2008-08-20 16:49:17 UTC (rev 227) +++ trunk/http/_framework/lib/Item.Liste.class.php 2008-08-20 17:33:23 UTC (rev 228) @@ -7,14 +7,16 @@ var $lien_icone; var $javacript; var $javascript_icone; + var $selected; - function __construct($texte='', $lien='', $icone='', $lien_icone='', $javascript='', $javascript_icone=''){ + function __construct($texte='', $lien='', $icone='', $lien_icone='', $javascript='', $javascript_icone='', $selected=false){ $this->texte = $texte; $this->lien = $lien; $this->icone = $icone; $this->lien_icone = $lien_icone; $this->javascript = $javascript; $this->javascript_icone = $javascript_icone; + $this->selected = $selected; } function output(){ @@ -26,6 +28,7 @@ $smarty->assign('lien_icone', $this->lien_icone); $smarty->assign('javascript', $this->javascript); $smarty->assign('javascript_icone', $this->javascript_icone); + $smarty->assign('selected', $this->selected); $content = $smarty->fetch('item_liste.tpl'); @@ -35,6 +38,7 @@ $smarty->clear_assign('lien_icone'); $smarty->clear_assign('javascript'); $smarty->clear_assign('javascript_icone'); + $smarty->clear_assign('selected'); return $content; } Modified: trunk/http/_framework/lib/Item.Mosaique.class.php =================================================================== --- trunk/http/_framework/lib/Item.Mosaique.class.php 2008-08-20 16:49:17 UTC (rev 227) +++ trunk/http/_framework/lib/Item.Mosaique.class.php 2008-08-20 17:33:23 UTC (rev 228) @@ -5,14 +5,16 @@ var $lien; var $image; var $javacript; + var $selected; - function __construct($texte='', $lien='', $image='', $javascript=''){ + function __construct($texte='', $lien='', $image='', $javascript='', $selected=false){ $this->texte = $texte; $this->lien = $lien; $this->image = $image; $this->javascript = $javascript; + $this->selected = $selected; } - + function output(){ global $smarty; @@ -20,13 +22,15 @@ $smarty->assign('lien', $this->lien); $smarty->assign('image', $this->image); $smarty->assign('javascript', $this->javascript); - + $smarty->assign('selected', $this->selected); + $content = $smarty->fetch('item_mosaique.tpl'); $smarty->clear_assign('texte'); $smarty->clear_assign('lien'); $smarty->clear_assign('image'); $smarty->clear_assign('javascript'); + $smarty->clear_assign('selected'); return $content; } Deleted: trunk/http/_utilisateur/contentVLC =================================================================== --- trunk/http/_utilisateur/contentVLC 2008-08-20 16:49:17 UTC (rev 227) +++ trunk/http/_utilisateur/contentVLC 2008-08-20 17:33:23 UTC (rev 228) @@ -1,33 +0,0 @@ -<!-- saved from url=(0022)http://internet.e-mail --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -|00:00:00|fake:|00:00:00|stop|C:\Program Files\Easyboxv3\http\skin\mediacenter\background\bg.png Property changes on: trunk/http/skin/mediacenter/interface/fond30x30s.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Property changes on: trunk/http/skin/mediacenter/interface/fond530x30s.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Property changes on: trunk/http/skin/mediacenter/interface/fond90x130s.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/http/skin/mediacenter/item_liste.tpl =================================================================== --- trunk/http/skin/mediacenter/item_liste.tpl 2008-08-20 16:49:17 UTC (rev 227) +++ trunk/http/skin/mediacenter/item_liste.tpl 2008-08-20 17:33:23 UTC (rev 228) @@ -2,7 +2,7 @@ <tr height="30"> {if $icone}<td width="35" heigth="30"> {if $lien_icone}<a href="{$lien_icone}" {$javascript_icone}>{/if} - <table width="30" height="30" border="0" cellpadding="0" cellspacing="0" background="{$INTERFACE_REP}fond30x30.gif" once rollover> + <table width="30" height="30" border="0" cellpadding="0" cellspacing="0" background="{$INTERFACE_REP}fond30x30{if $selected}s{/if}.gif" once rollover> <tr height="30"> <td width="30" height="30" align="center" valign="middle"> <img src="{$icone}" border="0" width="25" height="25"> @@ -14,8 +14,8 @@ <td height="30"> {if $lien} - <a href="{$lien}" {$javascript}> - <table height="30" background="{$INTERFACE_REP}fond530x30.gif" once rollover cellpadding="0" cellspacing="0"> + <a href="{$lien}" {$javascript} {if $selected}focused{/if}> + <table height="30" background="{$INTERFACE_REP}fond530x30{if $selected}s{/if}.gif" once rollover cellpadding="0" cellspacing="0"> <tr> <td width="570" height="30"> {$texte|strip_delimiters|truncate:52} Modified: trunk/http/skin/mediacenter/item_mosaique.tpl =================================================================== --- trunk/http/skin/mediacenter/item_mosaique.tpl 2008-08-20 16:49:17 UTC (rev 227) +++ trunk/http/skin/mediacenter/item_mosaique.tpl 2008-08-20 17:33:23 UTC (rev 228) @@ -1,5 +1,5 @@ -{if $lien}<a href="{$lien}" {$javascript}>{/if} - <table border="0" cellpadding="0" cellspacing="0" width="90" height="130" background="{$INTERFACE_REP}fond90x130.gif" once rollover> +{if $lien}<a href="{$lien}" {$javascript} {if $selected}focused{/if}>{/if} + <table border="0" cellpadding="0" cellspacing="0" width="90" height="130" background="{$INTERFACE_REP}fond90x130{if $selected}s{/if}.gif" once rollover> <tr height="90"> <td width="90" height="90" valign="middle" align="center"> <img border="0" width="80" height="80" src="{$IMG2FBX}?img={$image|urlencode}&width=80&height=80&cache=1"> Property changes on: trunk/http/skin/mediacenter/sources/fond30x30s.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Property changes on: trunk/http/skin/mediacenter/sources/fond530x30s.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Property changes on: trunk/http/skin/mediacenter/sources/fond90x130s.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. |
From: <ara...@us...> - 2008-08-20 16:49:22
|
Revision: 227 http://easybox-mod.svn.sourceforge.net/easybox-mod/?rev=227&view=rev Author: aragornis Date: 2008-08-20 16:49:17 +0000 (Wed, 20 Aug 2008) Log Message: ----------- Added Paths: ----------- trunk/packages/setup-NSIS-win32.nsi Removed Paths: ------------- trunk/packages/setup.nsi Copied: trunk/packages/setup-NSIS-win32.nsi (from rev 226, trunk/packages/setup.nsi) =================================================================== --- trunk/packages/setup-NSIS-win32.nsi (rev 0) +++ trunk/packages/setup-NSIS-win32.nsi 2008-08-20 16:49:17 UTC (rev 227) @@ -0,0 +1,354 @@ +# Auto-generated by EclipseNSIS Script Wizard +# 3 ao\xFBt 2008 13:08:24 + +Name Easybox + +# Defines +!define REGKEY "SOFTWARE\$(^Name)" +!define VERSION "5.0.0-alpha" +!define COMPANY "Easybox Team" +!define URL http://www.easybox-freeplayer.com + +# MUI defines +!define MUI_ICON ..\EasyBox.ico +!define MUI_FINISHPAGE_NOAUTOCLOSE +!define MUI_STARTMENUPAGE_REGISTRY_ROOT HKLM +!define MUI_STARTMENUPAGE_NODISABLE +!define MUI_STARTMENUPAGE_REGISTRY_KEY ${REGKEY} +!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME StartMenuGroup +!define MUI_STARTMENUPAGE_DEFAULTFOLDER Easybox +!define MUI_FINISHPAGE_RUN $INSTDIR\EasyBox.exe +!define MUI_FINISHPAGE_RUN_PARAMETERS -StartAndConfig +!define MUI_UNICON ..\EasyBox2.ico +!define MUI_UNFINISHPAGE_NOAUTOCLOSE + +ComponentText "Selectionnez les parties d'Easybox \xE0 installer.." + +# Included files +!include Sections.nsh +!include MUI.nsh + +# Variables +Var StartMenuGroup + +# Installer pages +!insertmacro MUI_PAGE_WELCOME +!insertmacro MUI_PAGE_LICENSE ..\Readme.txt +!insertmacro MUI_PAGE_DIRECTORY +!insertmacro MUI_PAGE_STARTMENU Application $StartMenuGroup +!insertmacro MUI_PAGE_COMPONENTS +!insertmacro MUI_PAGE_INSTFILES +!insertmacro MUI_PAGE_FINISH +!insertmacro MUI_UNPAGE_CONFIRM +!insertmacro MUI_UNPAGE_INSTFILES + +# Installer languages +!insertmacro MUI_LANGUAGE French + +# Installer attributes +OutFile ..\Easybox.win.5.0.0.exe +InstallDir $PROGRAMFILES\Easybox +CRCCheck on +XPStyle on +ShowInstDetails show +VIProductVersion "5.0.0.0" +VIAddVersionKey ProductName Easybox +VIAddVersionKey ProductVersion "${VERSION}" +VIAddVersionKey CompanyName "${COMPANY}" +VIAddVersionKey CompanyWebsite "${URL}" +VIAddVersionKey FileVersion "${VERSION}" +VIAddVersionKey FileDescription "" +VIAddVersionKey LegalCopyright "" +InstallDirRegKey HKLM "${REGKEY}" Path +ShowUninstDetails show + +# Installer sections +Section "!Easybox v5" SEC0000 + IfFileExists $INSTDIR\EasyBox.exe 0 +32 + ExecWait '"$INSTDIR\EasyBox.exe" -CloseAll' + DetailPrint "Fermeture de Easybox (15 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (14 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (13 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (12 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (11 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (10 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (9 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (8 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (7 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (6 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (5 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (4 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (3 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (2 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (1 sec)..." + Sleep 1000 + + SetOutPath $INSTDIR\http + SetOverwrite on + File /r /x _utilisateur /x %%*%%* /x .cache /x .settings /x .project /x .svn * + SetOutPath $INSTDIR\http\_utilisateur + File /r /x *.db /x *.ini /x *.db /x contentVLC /x *.gif /x *.png /x *.jpg /x *.m3u /x .svn _utilisateur\*.* + File ..\http\_utilisateur\modules.db + File ..\http\_utilisateur\podcast.db + SetOutPath $INSTDIR\php5 + File /r ..\php5\* + SetOutPath $INSTDIR\apache + File /r /x error.log ..\apache\* + SetOutPath $INSTDIR\vlc + File /r ..\vlc\* + SetOutPath $INSTDIR + File ..\lanceur.ver + File ..\NtRights.exe + File ..\RunURL.exe + File ..\SC.exe + File ..\SrvAny.exe + File ..\VLCApp.pid + File ..\VLCSvc.pid + File ..\About.dat + File ..\AConf.dat + File ..\apache.conf + File ..\CUsrMgr.exe + File ..\easybox + File ..\EasyBox.exe + File ..\EasyBox.ico + File ..\EasyBox.jpg + File ..\EasyBox2.ico + File ..\Files.dat + File ..\InstSrv.exe + + WriteINIStr $INSTDIR\Easybox.cfg EasyBox VLauncher 1.3.0.7 + WriteINIStr $INSTDIR\Easybox.cfg EasyBox ModName EasyBox + WriteINIStr $INSTDIR\Easybox.cfg EasyBox ModVersion 5.0 + WriteINIStr $INSTDIR\Easybox.cfg EasyBox IconName EasyBox.ico + WriteINIStr $INSTDIR\Easybox.cfg EasyBox OutOfOrderIcon EasyBox2.ico + WriteINIStr $INSTDIR\Easybox.cfg EasyBox ModPath $INSTDIR + WriteINIStr $INSTDIR\Easybox.cfg EasyBox IniModFile EasyBox.ini + WriteINIStr $INSTDIR\Easybox.cfg EasyBox SplashScreen 1 + WriteINIStr $INSTDIR\Easybox.cfg EasyBox SplashImage EasyBox.jpg + WriteINIStr $INSTDIR\Easybox.cfg EasyBox ApacheTemplateFile AConf.dat + WriteINIStr $INSTDIR\Easybox.cfg EasyBox AboutWindowFile About.dat + WriteINIStr $INSTDIR\Easybox.cfg EasyBox ListFile Files.dat + WriteINIStr $INSTDIR\Easybox.cfg EasyBox VLCDefaultFile easybox-defaut + WriteINIStr $INSTDIR\EasyBox.ini VLC VLCPath $INSTDIR\VLC\VLC.exe + WriteINIStr $INSTDIR\EasyBox.ini VLC VlcShowWindow 0 + WriteINIStr $INSTDIR\EasyBox.ini VLC VlcParameters `--config="easybox" --intf=http --http-src="$INSTDIR\http\http-vlc" --http-host=:8081` + WriteINIStr $INSTDIR\EasyBox.ini VLC RunAsService 0 + WriteINIStr $INSTDIR\EasyBox.ini VLC VLCStopCommand "http://localhost:8081/lecteur/action.html?control=shutdown" + WriteINIStr $INSTDIR\EasyBox.ini VLC VLCLoggerOn 0 + WriteINIStr $INSTDIR\EasyBox.ini VLC VLCDnldURL "http://www.easybox-freeplayer.com/vlc.zip" + WriteINIStr $INSTDIR\EasyBox.ini VLC VLCStatusPage "http://localhost:8081/status.html" + WriteINIStr $INSTDIR\EasyBox.ini VLC VLCConfigFile "easybox" + WriteINIStr $INSTDIR\EasyBox.ini VLC VLCUpdURL "http://www.easybox-freeplayer.com/vlc.ver" + WriteINIStr $INSTDIR\EasyBox.ini Apache ApachePath "$INSTDIR\Apache\Apache.exe" + WriteINIStr $INSTDIR\EasyBox.ini Apache ApacheConf "$INSTDIR\apache.conf" + WriteINIStr $INSTDIR\EasyBox.ini Apache AllowedIP "127.0.0.1;192.168.;212.27." + WriteINIStr $INSTDIR\EasyBox.ini Apache WebPagePath "$INSTDIR\http" + WriteINIStr $INSTDIR\EasyBox.ini Apache ApachePort 8080 + WriteINIStr $INSTDIR\EasyBox.ini Apache ApacheStatusPage "http://localhost:8080/status.html" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox ModConfig "http://localhost:8080/configuration/configuration.php" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox AutoRun 0 + WriteINIStr $INSTDIR\EasyBox.ini EasyBox AccountType "system" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox SvcAccount ".\MonCompte" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox PWDAccount "39F972DAC98F9AAE720A66CDF23E5B7F" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox ModDnldURL "http://www.easybox-freeplayer.com/easybox.zip" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox ModUpdURL "http://www.easybox-freeplayer.com/lanceur.ver" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox MultiposteURL "http://mafreebox.freebox.fr/freeboxtv/playlist.m3u" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox MultipostePath "\http\_utilisateur\multiposte.m3u" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox MapDrivePath "\http\_utilisateur" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox MapDriveURLPath "http://localhost:8080/_utilisateur" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox LogModOn 0 + WriteINIStr $INSTDIR\EasyBox.ini EasyBox NetLetter1 "" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox NetLetter2 "" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox NetLetter3 "" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox NetLetter4 "" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox NetLetter5 "" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox NetLetter6 "" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox NetLetter7 "" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox NetLetter8 "" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox NetLetter9 "" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox NetLetter10 "" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox UncPath1 "" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox UncPath2 "" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox UncPath3 "" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox UncPath4 "" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox UncPath5 "" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox UncPath6 "" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox UncPath7 "" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox UncPath8 "" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox UncPath9 "" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox UncPath10 "" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox ScheduledPage1 "97|http://localhost:8080/configuration/scan_video.php?scan=1" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox ScheduledPage2 "89|http://localhost:8080/configuration/scan_video.php?get_info=1&research=1" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox ScheduledPage3 "83|http://localhost:8080/configuration/scan_video.php?get_celebrites=1&research=1" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox ScheduledPage4 "" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox ScheduledPage5 "" + + WriteRegStr HKLM "${REGKEY}\Components" "Easybox v5" 1 +SectionEnd + +Section "Lancer au d\xE9marrage" SEC0001 + WriteINIStr $INSTDIR\EasyBox.ini EasyBox AutoRun 1 + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Run" "Easybox" "$INSTDIR\EasyBox.exe" +SectionEnd + +Section -post SEC0002 + WriteRegStr HKLM "${REGKEY}" Path $INSTDIR + SetOutPath $INSTDIR + WriteUninstaller $INSTDIR\uninstall.exe + !insertmacro MUI_STARTMENU_WRITE_BEGIN Application + SetOutPath $SMPROGRAMS\$StartMenuGroup + CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Uninstall $(^Name).lnk" $INSTDIR\uninstall.exe + CreateShortcut "$SMPROGRAMS\$StartMenuGroup\$(^Name).lnk" "$INSTDIR\Easybox.exe" + CreateShortcut "$SMPROGRAMS\$StartMenuGroup\$(^Name).lnk" "$INSTDIR\Easybox.exe" "-Config" + !insertmacro MUI_STARTMENU_WRITE_END + WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayName "$(^Name)" + WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayVersion "${VERSION}" + WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" Publisher "${COMPANY}" + WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" URLInfoAbout "${URL}" + WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayIcon $INSTDIR\uninstall.exe + WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" UninstallString $INSTDIR\uninstall.exe + WriteRegDWORD HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoModify 1 + WriteRegDWORD HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoRepair 1 +SectionEnd + +# Macro for selecting uninstaller sections +!macro SELECT_UNSECTION SECTION_NAME UNSECTION_ID + Push $R0 + ReadRegStr $R0 HKLM "${REGKEY}\Components" "${SECTION_NAME}" + StrCmp $R0 1 0 next${UNSECTION_ID} + !insertmacro SelectSection "${UNSECTION_ID}" + GoTo done${UNSECTION_ID} +next${UNSECTION_ID}: + !insertmacro UnselectSection "${UNSECTION_ID}" +done${UNSECTION_ID}: + Pop $R0 +!macroend + +# Uninstaller sections +Section "-un.Easybox v5" UNSEC0000 + IfFileExists $INSTDIR\EasyBox.exe 0 +32 + ExecWait '"$INSTDIR\EasyBox.exe" -CloseAll' + DetailPrint "Fermeture de Easybox (15 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (14 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (13 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (12 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (11 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (10 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (9 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (8 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (7 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (6 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (5 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (4 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (3 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (2 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (1 sec)..." + Sleep 1000 + + Delete "$INSTDIR\*" + RMDir /r /REBOOTOK $INSTDIR + DeleteRegValue HKLM "${REGKEY}\Components" "Easybox v5" +SectionEnd + +Section "-un.Lancer au d\xE9marrage" UNSEC0001 + DeleteRegValue HKLM "Software\Microsoft\Windows\CurrentVersion\Run" "Easybox" +SectionEnd + +Section -un.post UNSEC0002 + DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" + + IfFileExists $INSTDIR\EasyBox.exe 0 +32 + ExecWait '"$INSTDIR\EasyBox.exe" -CloseAll' + DetailPrint "Fermeture de Easybox (15 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (14 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (13 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (12 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (11 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (10 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (9 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (8 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (7 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (6 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (5 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (4 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (3 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (2 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (1 sec)..." + Sleep 1000 + + Delete "$INSTDIR\*" + RMDir /r /REBOOTOK $INSTDIR + DeleteRegValue HKLM "${REGKEY}\Components" "Easybox v5" + DeleteRegValue HKLM "Software\Microsoft\Windows\CurrentVersion\Run" "Easybox" + + Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\Uninstall $(^Name).lnk" + Delete /REBOOTOK $INSTDIR\uninstall.exe + DeleteRegValue HKLM "${REGKEY}" StartMenuGroup + DeleteRegValue HKLM "${REGKEY}" Path + DeleteRegKey /IfEmpty HKLM "${REGKEY}\Components" + DeleteRegKey /IfEmpty HKLM "${REGKEY}" + RmDir /REBOOTOK $SMPROGRAMS\$StartMenuGroup + RmDir /REBOOTOK $INSTDIR +SectionEnd + +# Installer functions +Function .onInit + InitPluginsDir +FunctionEnd + +# Uninstaller functions +Function un.onInit + ReadRegStr $INSTDIR HKLM "${REGKEY}" Path + !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuGroup + !insertmacro SELECT_UNSECTION Easybox ${UNSEC0000} + !insertmacro SELECT_UNSECTION "Lancer avec Windows" ${UNSEC0001} +FunctionEnd + +# Section Descriptions +!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN +!insertmacro MUI_DESCRIPTION_TEXT ${SEC0000} "Le core d'Easybox v5" +!insertmacro MUI_DESCRIPTION_TEXT ${SEC0001} "Voulez-vous lancer Easybox en m\xEAme temps que Windows ?" +!insertmacro MUI_FUNCTION_DESCRIPTION_END + Deleted: trunk/packages/setup.nsi =================================================================== --- trunk/packages/setup.nsi 2008-08-20 16:48:23 UTC (rev 226) +++ trunk/packages/setup.nsi 2008-08-20 16:49:17 UTC (rev 227) @@ -1,354 +0,0 @@ -# Auto-generated by EclipseNSIS Script Wizard -# 3 ao\xFBt 2008 13:08:24 - -Name Easybox - -# Defines -!define REGKEY "SOFTWARE\$(^Name)" -!define VERSION "5.0.0-alpha" -!define COMPANY "Easybox Team" -!define URL http://www.easybox-freeplayer.com - -# MUI defines -!define MUI_ICON ..\EasyBox.ico -!define MUI_FINISHPAGE_NOAUTOCLOSE -!define MUI_STARTMENUPAGE_REGISTRY_ROOT HKLM -!define MUI_STARTMENUPAGE_NODISABLE -!define MUI_STARTMENUPAGE_REGISTRY_KEY ${REGKEY} -!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME StartMenuGroup -!define MUI_STARTMENUPAGE_DEFAULTFOLDER Easybox -!define MUI_FINISHPAGE_RUN $INSTDIR\EasyBox.exe -!define MUI_FINISHPAGE_RUN_PARAMETERS -StartAndConfig -!define MUI_UNICON ..\EasyBox2.ico -!define MUI_UNFINISHPAGE_NOAUTOCLOSE - -ComponentText "Selectionnez les parties d'Easybox \xE0 installer.." - -# Included files -!include Sections.nsh -!include MUI.nsh - -# Variables -Var StartMenuGroup - -# Installer pages -!insertmacro MUI_PAGE_WELCOME -!insertmacro MUI_PAGE_LICENSE ..\Readme.txt -!insertmacro MUI_PAGE_DIRECTORY -!insertmacro MUI_PAGE_STARTMENU Application $StartMenuGroup -!insertmacro MUI_PAGE_COMPONENTS -!insertmacro MUI_PAGE_INSTFILES -!insertmacro MUI_PAGE_FINISH -!insertmacro MUI_UNPAGE_CONFIRM -!insertmacro MUI_UNPAGE_INSTFILES - -# Installer languages -!insertmacro MUI_LANGUAGE French - -# Installer attributes -OutFile ..\Easybox.win.5.0.0.exe -InstallDir $PROGRAMFILES\Easybox -CRCCheck on -XPStyle on -ShowInstDetails show -VIProductVersion "5.0.0.0" -VIAddVersionKey ProductName Easybox -VIAddVersionKey ProductVersion "${VERSION}" -VIAddVersionKey CompanyName "${COMPANY}" -VIAddVersionKey CompanyWebsite "${URL}" -VIAddVersionKey FileVersion "${VERSION}" -VIAddVersionKey FileDescription "" -VIAddVersionKey LegalCopyright "" -InstallDirRegKey HKLM "${REGKEY}" Path -ShowUninstDetails show - -# Installer sections -Section "!Easybox v5" SEC0000 - IfFileExists $INSTDIR\EasyBox.exe 0 +32 - ExecWait '"$INSTDIR\EasyBox.exe" -CloseAll' - DetailPrint "Fermeture de Easybox (15 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (14 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (13 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (12 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (11 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (10 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (9 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (8 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (7 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (6 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (5 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (4 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (3 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (2 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (1 sec)..." - Sleep 1000 - - SetOutPath $INSTDIR\http - SetOverwrite on - File /r /x _utilisateur /x %%*%%* /x .cache /x .settings /x .project /x .svn * - SetOutPath $INSTDIR\http\_utilisateur - File /r /x *.db /x *.ini /x *.db /x contentVLC /x *.gif /x *.png /x *.jpg /x *.m3u /x .svn _utilisateur\*.* - File ..\http\_utilisateur\modules.db - File ..\http\_utilisateur\podcast.db - SetOutPath $INSTDIR\php5 - File /r ..\php5\* - SetOutPath $INSTDIR\apache - File /r /x error.log ..\apache\* - SetOutPath $INSTDIR\vlc - File /r ..\vlc\* - SetOutPath $INSTDIR - File ..\lanceur.ver - File ..\NtRights.exe - File ..\RunURL.exe - File ..\SC.exe - File ..\SrvAny.exe - File ..\VLCApp.pid - File ..\VLCSvc.pid - File ..\About.dat - File ..\AConf.dat - File ..\apache.conf - File ..\CUsrMgr.exe - File ..\easybox - File ..\EasyBox.exe - File ..\EasyBox.ico - File ..\EasyBox.jpg - File ..\EasyBox2.ico - File ..\Files.dat - File ..\InstSrv.exe - - WriteINIStr $INSTDIR\Easybox.cfg EasyBox VLauncher 1.3.0.7 - WriteINIStr $INSTDIR\Easybox.cfg EasyBox ModName EasyBox - WriteINIStr $INSTDIR\Easybox.cfg EasyBox ModVersion 5.0 - WriteINIStr $INSTDIR\Easybox.cfg EasyBox IconName EasyBox.ico - WriteINIStr $INSTDIR\Easybox.cfg EasyBox OutOfOrderIcon EasyBox2.ico - WriteINIStr $INSTDIR\Easybox.cfg EasyBox ModPath $INSTDIR - WriteINIStr $INSTDIR\Easybox.cfg EasyBox IniModFile EasyBox.ini - WriteINIStr $INSTDIR\Easybox.cfg EasyBox SplashScreen 1 - WriteINIStr $INSTDIR\Easybox.cfg EasyBox SplashImage EasyBox.jpg - WriteINIStr $INSTDIR\Easybox.cfg EasyBox ApacheTemplateFile AConf.dat - WriteINIStr $INSTDIR\Easybox.cfg EasyBox AboutWindowFile About.dat - WriteINIStr $INSTDIR\Easybox.cfg EasyBox ListFile Files.dat - WriteINIStr $INSTDIR\Easybox.cfg EasyBox VLCDefaultFile easybox-defaut - WriteINIStr $INSTDIR\EasyBox.ini VLC VLCPath $INSTDIR\VLC\VLC.exe - WriteINIStr $INSTDIR\EasyBox.ini VLC VlcShowWindow 0 - WriteINIStr $INSTDIR\EasyBox.ini VLC VlcParameters `--config="easybox" --intf=http --http-src="$INSTDIR\http\http-vlc" --http-host=:8081` - WriteINIStr $INSTDIR\EasyBox.ini VLC RunAsService 0 - WriteINIStr $INSTDIR\EasyBox.ini VLC VLCStopCommand "http://localhost:8081/lecteur/action.html?control=shutdown" - WriteINIStr $INSTDIR\EasyBox.ini VLC VLCLoggerOn 0 - WriteINIStr $INSTDIR\EasyBox.ini VLC VLCDnldURL "http://www.easybox-freeplayer.com/vlc.zip" - WriteINIStr $INSTDIR\EasyBox.ini VLC VLCStatusPage "http://localhost:8081/status.html" - WriteINIStr $INSTDIR\EasyBox.ini VLC VLCConfigFile "easybox" - WriteINIStr $INSTDIR\EasyBox.ini VLC VLCUpdURL "http://www.easybox-freeplayer.com/vlc.ver" - WriteINIStr $INSTDIR\EasyBox.ini Apache ApachePath "$INSTDIR\Apache\Apache.exe" - WriteINIStr $INSTDIR\EasyBox.ini Apache ApacheConf "$INSTDIR\apache.conf" - WriteINIStr $INSTDIR\EasyBox.ini Apache AllowedIP "127.0.0.1;192.168.;212.27." - WriteINIStr $INSTDIR\EasyBox.ini Apache WebPagePath "$INSTDIR\http" - WriteINIStr $INSTDIR\EasyBox.ini Apache ApachePort 8080 - WriteINIStr $INSTDIR\EasyBox.ini Apache ApacheStatusPage "http://localhost:8080/status.html" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox ModConfig "http://localhost:8080/configuration/configuration.php" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox AutoRun 0 - WriteINIStr $INSTDIR\EasyBox.ini EasyBox AccountType "system" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox SvcAccount ".\MonCompte" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox PWDAccount "39F972DAC98F9AAE720A66CDF23E5B7F" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox ModDnldURL "http://www.easybox-freeplayer.com/easybox.zip" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox ModUpdURL "http://www.easybox-freeplayer.com/lanceur.ver" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox MultiposteURL "http://mafreebox.freebox.fr/freeboxtv/playlist.m3u" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox MultipostePath "\http\_utilisateur\multiposte.m3u" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox MapDrivePath "\http\_utilisateur" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox MapDriveURLPath "http://localhost:8080/_utilisateur" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox LogModOn 0 - WriteINIStr $INSTDIR\EasyBox.ini EasyBox NetLetter1 "" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox NetLetter2 "" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox NetLetter3 "" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox NetLetter4 "" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox NetLetter5 "" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox NetLetter6 "" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox NetLetter7 "" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox NetLetter8 "" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox NetLetter9 "" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox NetLetter10 "" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox UncPath1 "" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox UncPath2 "" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox UncPath3 "" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox UncPath4 "" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox UncPath5 "" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox UncPath6 "" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox UncPath7 "" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox UncPath8 "" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox UncPath9 "" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox UncPath10 "" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox ScheduledPage1 "97|http://localhost:8080/configuration/scan_video.php?scan=1" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox ScheduledPage2 "89|http://localhost:8080/configuration/scan_video.php?get_info=1&research=1" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox ScheduledPage3 "83|http://localhost:8080/configuration/scan_video.php?get_celebrites=1&research=1" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox ScheduledPage4 "" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox ScheduledPage5 "" - - WriteRegStr HKLM "${REGKEY}\Components" "Easybox v5" 1 -SectionEnd - -Section "Lancer au d\xE9marrage" SEC0001 - WriteINIStr $INSTDIR\EasyBox.ini EasyBox AutoRun 1 - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Run" "Easybox" "$INSTDIR\EasyBox.exe" -SectionEnd - -Section -post SEC0002 - WriteRegStr HKLM "${REGKEY}" Path $INSTDIR - SetOutPath $INSTDIR - WriteUninstaller $INSTDIR\uninstall.exe - !insertmacro MUI_STARTMENU_WRITE_BEGIN Application - SetOutPath $SMPROGRAMS\$StartMenuGroup - CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Uninstall $(^Name).lnk" $INSTDIR\uninstall.exe - CreateShortcut "$SMPROGRAMS\$StartMenuGroup\$(^Name).lnk" "$INSTDIR\Easybox.exe" - CreateShortcut "$SMPROGRAMS\$StartMenuGroup\$(^Name).lnk" "$INSTDIR\Easybox.exe" "-Config" - !insertmacro MUI_STARTMENU_WRITE_END - WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayName "$(^Name)" - WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayVersion "${VERSION}" - WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" Publisher "${COMPANY}" - WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" URLInfoAbout "${URL}" - WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayIcon $INSTDIR\uninstall.exe - WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" UninstallString $INSTDIR\uninstall.exe - WriteRegDWORD HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoModify 1 - WriteRegDWORD HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoRepair 1 -SectionEnd - -# Macro for selecting uninstaller sections -!macro SELECT_UNSECTION SECTION_NAME UNSECTION_ID - Push $R0 - ReadRegStr $R0 HKLM "${REGKEY}\Components" "${SECTION_NAME}" - StrCmp $R0 1 0 next${UNSECTION_ID} - !insertmacro SelectSection "${UNSECTION_ID}" - GoTo done${UNSECTION_ID} -next${UNSECTION_ID}: - !insertmacro UnselectSection "${UNSECTION_ID}" -done${UNSECTION_ID}: - Pop $R0 -!macroend - -# Uninstaller sections -Section "-un.Easybox v5" UNSEC0000 - IfFileExists $INSTDIR\EasyBox.exe 0 +32 - ExecWait '"$INSTDIR\EasyBox.exe" -CloseAll' - DetailPrint "Fermeture de Easybox (15 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (14 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (13 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (12 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (11 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (10 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (9 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (8 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (7 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (6 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (5 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (4 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (3 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (2 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (1 sec)..." - Sleep 1000 - - Delete "$INSTDIR\*" - RMDir /r /REBOOTOK $INSTDIR - DeleteRegValue HKLM "${REGKEY}\Components" "Easybox v5" -SectionEnd - -Section "-un.Lancer au d\xE9marrage" UNSEC0001 - DeleteRegValue HKLM "Software\Microsoft\Windows\CurrentVersion\Run" "Easybox" -SectionEnd - -Section -un.post UNSEC0002 - DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" - - IfFileExists $INSTDIR\EasyBox.exe 0 +32 - ExecWait '"$INSTDIR\EasyBox.exe" -CloseAll' - DetailPrint "Fermeture de Easybox (15 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (14 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (13 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (12 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (11 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (10 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (9 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (8 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (7 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (6 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (5 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (4 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (3 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (2 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (1 sec)..." - Sleep 1000 - - Delete "$INSTDIR\*" - RMDir /r /REBOOTOK $INSTDIR - DeleteRegValue HKLM "${REGKEY}\Components" "Easybox v5" - DeleteRegValue HKLM "Software\Microsoft\Windows\CurrentVersion\Run" "Easybox" - - Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\Uninstall $(^Name).lnk" - Delete /REBOOTOK $INSTDIR\uninstall.exe - DeleteRegValue HKLM "${REGKEY}" StartMenuGroup - DeleteRegValue HKLM "${REGKEY}" Path - DeleteRegKey /IfEmpty HKLM "${REGKEY}\Components" - DeleteRegKey /IfEmpty HKLM "${REGKEY}" - RmDir /REBOOTOK $SMPROGRAMS\$StartMenuGroup - RmDir /REBOOTOK $INSTDIR -SectionEnd - -# Installer functions -Function .onInit - InitPluginsDir -FunctionEnd - -# Uninstaller functions -Function un.onInit - ReadRegStr $INSTDIR HKLM "${REGKEY}" Path - !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuGroup - !insertmacro SELECT_UNSECTION Easybox ${UNSEC0000} - !insertmacro SELECT_UNSECTION "Lancer avec Windows" ${UNSEC0001} -FunctionEnd - -# Section Descriptions -!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN -!insertmacro MUI_DESCRIPTION_TEXT ${SEC0000} "Le core d'Easybox v5" -!insertmacro MUI_DESCRIPTION_TEXT ${SEC0001} "Voulez-vous lancer Easybox en m\xEAme temps que Windows ?" -!insertmacro MUI_FUNCTION_DESCRIPTION_END - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ara...@us...> - 2008-08-20 16:48:28
|
Revision: 226 http://easybox-mod.svn.sourceforge.net/easybox-mod/?rev=226&view=rev Author: aragornis Date: 2008-08-20 16:48:23 +0000 (Wed, 20 Aug 2008) Log Message: ----------- Added Paths: ----------- trunk/packages/.project trunk/packages/setup.nsi Added: trunk/packages/.project =================================================================== --- trunk/packages/.project (rev 0) +++ trunk/packages/.project 2008-08-20 16:48:23 UTC (rev 226) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>Packages</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + </buildSpec> + <natures> + </natures> +</projectDescription> Property changes on: trunk/packages/.project ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/packages/setup.nsi =================================================================== --- trunk/packages/setup.nsi (rev 0) +++ trunk/packages/setup.nsi 2008-08-20 16:48:23 UTC (rev 226) @@ -0,0 +1,354 @@ +# Auto-generated by EclipseNSIS Script Wizard +# 3 ao\xFBt 2008 13:08:24 + +Name Easybox + +# Defines +!define REGKEY "SOFTWARE\$(^Name)" +!define VERSION "5.0.0-alpha" +!define COMPANY "Easybox Team" +!define URL http://www.easybox-freeplayer.com + +# MUI defines +!define MUI_ICON ..\EasyBox.ico +!define MUI_FINISHPAGE_NOAUTOCLOSE +!define MUI_STARTMENUPAGE_REGISTRY_ROOT HKLM +!define MUI_STARTMENUPAGE_NODISABLE +!define MUI_STARTMENUPAGE_REGISTRY_KEY ${REGKEY} +!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME StartMenuGroup +!define MUI_STARTMENUPAGE_DEFAULTFOLDER Easybox +!define MUI_FINISHPAGE_RUN $INSTDIR\EasyBox.exe +!define MUI_FINISHPAGE_RUN_PARAMETERS -StartAndConfig +!define MUI_UNICON ..\EasyBox2.ico +!define MUI_UNFINISHPAGE_NOAUTOCLOSE + +ComponentText "Selectionnez les parties d'Easybox \xE0 installer.." + +# Included files +!include Sections.nsh +!include MUI.nsh + +# Variables +Var StartMenuGroup + +# Installer pages +!insertmacro MUI_PAGE_WELCOME +!insertmacro MUI_PAGE_LICENSE ..\Readme.txt +!insertmacro MUI_PAGE_DIRECTORY +!insertmacro MUI_PAGE_STARTMENU Application $StartMenuGroup +!insertmacro MUI_PAGE_COMPONENTS +!insertmacro MUI_PAGE_INSTFILES +!insertmacro MUI_PAGE_FINISH +!insertmacro MUI_UNPAGE_CONFIRM +!insertmacro MUI_UNPAGE_INSTFILES + +# Installer languages +!insertmacro MUI_LANGUAGE French + +# Installer attributes +OutFile ..\Easybox.win.5.0.0.exe +InstallDir $PROGRAMFILES\Easybox +CRCCheck on +XPStyle on +ShowInstDetails show +VIProductVersion "5.0.0.0" +VIAddVersionKey ProductName Easybox +VIAddVersionKey ProductVersion "${VERSION}" +VIAddVersionKey CompanyName "${COMPANY}" +VIAddVersionKey CompanyWebsite "${URL}" +VIAddVersionKey FileVersion "${VERSION}" +VIAddVersionKey FileDescription "" +VIAddVersionKey LegalCopyright "" +InstallDirRegKey HKLM "${REGKEY}" Path +ShowUninstDetails show + +# Installer sections +Section "!Easybox v5" SEC0000 + IfFileExists $INSTDIR\EasyBox.exe 0 +32 + ExecWait '"$INSTDIR\EasyBox.exe" -CloseAll' + DetailPrint "Fermeture de Easybox (15 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (14 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (13 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (12 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (11 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (10 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (9 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (8 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (7 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (6 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (5 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (4 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (3 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (2 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (1 sec)..." + Sleep 1000 + + SetOutPath $INSTDIR\http + SetOverwrite on + File /r /x _utilisateur /x %%*%%* /x .cache /x .settings /x .project /x .svn * + SetOutPath $INSTDIR\http\_utilisateur + File /r /x *.db /x *.ini /x *.db /x contentVLC /x *.gif /x *.png /x *.jpg /x *.m3u /x .svn _utilisateur\*.* + File ..\http\_utilisateur\modules.db + File ..\http\_utilisateur\podcast.db + SetOutPath $INSTDIR\php5 + File /r ..\php5\* + SetOutPath $INSTDIR\apache + File /r /x error.log ..\apache\* + SetOutPath $INSTDIR\vlc + File /r ..\vlc\* + SetOutPath $INSTDIR + File ..\lanceur.ver + File ..\NtRights.exe + File ..\RunURL.exe + File ..\SC.exe + File ..\SrvAny.exe + File ..\VLCApp.pid + File ..\VLCSvc.pid + File ..\About.dat + File ..\AConf.dat + File ..\apache.conf + File ..\CUsrMgr.exe + File ..\easybox + File ..\EasyBox.exe + File ..\EasyBox.ico + File ..\EasyBox.jpg + File ..\EasyBox2.ico + File ..\Files.dat + File ..\InstSrv.exe + + WriteINIStr $INSTDIR\Easybox.cfg EasyBox VLauncher 1.3.0.7 + WriteINIStr $INSTDIR\Easybox.cfg EasyBox ModName EasyBox + WriteINIStr $INSTDIR\Easybox.cfg EasyBox ModVersion 5.0 + WriteINIStr $INSTDIR\Easybox.cfg EasyBox IconName EasyBox.ico + WriteINIStr $INSTDIR\Easybox.cfg EasyBox OutOfOrderIcon EasyBox2.ico + WriteINIStr $INSTDIR\Easybox.cfg EasyBox ModPath $INSTDIR + WriteINIStr $INSTDIR\Easybox.cfg EasyBox IniModFile EasyBox.ini + WriteINIStr $INSTDIR\Easybox.cfg EasyBox SplashScreen 1 + WriteINIStr $INSTDIR\Easybox.cfg EasyBox SplashImage EasyBox.jpg + WriteINIStr $INSTDIR\Easybox.cfg EasyBox ApacheTemplateFile AConf.dat + WriteINIStr $INSTDIR\Easybox.cfg EasyBox AboutWindowFile About.dat + WriteINIStr $INSTDIR\Easybox.cfg EasyBox ListFile Files.dat + WriteINIStr $INSTDIR\Easybox.cfg EasyBox VLCDefaultFile easybox-defaut + WriteINIStr $INSTDIR\EasyBox.ini VLC VLCPath $INSTDIR\VLC\VLC.exe + WriteINIStr $INSTDIR\EasyBox.ini VLC VlcShowWindow 0 + WriteINIStr $INSTDIR\EasyBox.ini VLC VlcParameters `--config="easybox" --intf=http --http-src="$INSTDIR\http\http-vlc" --http-host=:8081` + WriteINIStr $INSTDIR\EasyBox.ini VLC RunAsService 0 + WriteINIStr $INSTDIR\EasyBox.ini VLC VLCStopCommand "http://localhost:8081/lecteur/action.html?control=shutdown" + WriteINIStr $INSTDIR\EasyBox.ini VLC VLCLoggerOn 0 + WriteINIStr $INSTDIR\EasyBox.ini VLC VLCDnldURL "http://www.easybox-freeplayer.com/vlc.zip" + WriteINIStr $INSTDIR\EasyBox.ini VLC VLCStatusPage "http://localhost:8081/status.html" + WriteINIStr $INSTDIR\EasyBox.ini VLC VLCConfigFile "easybox" + WriteINIStr $INSTDIR\EasyBox.ini VLC VLCUpdURL "http://www.easybox-freeplayer.com/vlc.ver" + WriteINIStr $INSTDIR\EasyBox.ini Apache ApachePath "$INSTDIR\Apache\Apache.exe" + WriteINIStr $INSTDIR\EasyBox.ini Apache ApacheConf "$INSTDIR\apache.conf" + WriteINIStr $INSTDIR\EasyBox.ini Apache AllowedIP "127.0.0.1;192.168.;212.27." + WriteINIStr $INSTDIR\EasyBox.ini Apache WebPagePath "$INSTDIR\http" + WriteINIStr $INSTDIR\EasyBox.ini Apache ApachePort 8080 + WriteINIStr $INSTDIR\EasyBox.ini Apache ApacheStatusPage "http://localhost:8080/status.html" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox ModConfig "http://localhost:8080/configuration/configuration.php" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox AutoRun 0 + WriteINIStr $INSTDIR\EasyBox.ini EasyBox AccountType "system" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox SvcAccount ".\MonCompte" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox PWDAccount "39F972DAC98F9AAE720A66CDF23E5B7F" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox ModDnldURL "http://www.easybox-freeplayer.com/easybox.zip" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox ModUpdURL "http://www.easybox-freeplayer.com/lanceur.ver" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox MultiposteURL "http://mafreebox.freebox.fr/freeboxtv/playlist.m3u" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox MultipostePath "\http\_utilisateur\multiposte.m3u" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox MapDrivePath "\http\_utilisateur" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox MapDriveURLPath "http://localhost:8080/_utilisateur" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox LogModOn 0 + WriteINIStr $INSTDIR\EasyBox.ini EasyBox NetLetter1 "" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox NetLetter2 "" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox NetLetter3 "" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox NetLetter4 "" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox NetLetter5 "" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox NetLetter6 "" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox NetLetter7 "" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox NetLetter8 "" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox NetLetter9 "" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox NetLetter10 "" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox UncPath1 "" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox UncPath2 "" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox UncPath3 "" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox UncPath4 "" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox UncPath5 "" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox UncPath6 "" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox UncPath7 "" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox UncPath8 "" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox UncPath9 "" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox UncPath10 "" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox ScheduledPage1 "97|http://localhost:8080/configuration/scan_video.php?scan=1" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox ScheduledPage2 "89|http://localhost:8080/configuration/scan_video.php?get_info=1&research=1" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox ScheduledPage3 "83|http://localhost:8080/configuration/scan_video.php?get_celebrites=1&research=1" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox ScheduledPage4 "" + WriteINIStr $INSTDIR\EasyBox.ini EasyBox ScheduledPage5 "" + + WriteRegStr HKLM "${REGKEY}\Components" "Easybox v5" 1 +SectionEnd + +Section "Lancer au d\xE9marrage" SEC0001 + WriteINIStr $INSTDIR\EasyBox.ini EasyBox AutoRun 1 + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Run" "Easybox" "$INSTDIR\EasyBox.exe" +SectionEnd + +Section -post SEC0002 + WriteRegStr HKLM "${REGKEY}" Path $INSTDIR + SetOutPath $INSTDIR + WriteUninstaller $INSTDIR\uninstall.exe + !insertmacro MUI_STARTMENU_WRITE_BEGIN Application + SetOutPath $SMPROGRAMS\$StartMenuGroup + CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Uninstall $(^Name).lnk" $INSTDIR\uninstall.exe + CreateShortcut "$SMPROGRAMS\$StartMenuGroup\$(^Name).lnk" "$INSTDIR\Easybox.exe" + CreateShortcut "$SMPROGRAMS\$StartMenuGroup\$(^Name).lnk" "$INSTDIR\Easybox.exe" "-Config" + !insertmacro MUI_STARTMENU_WRITE_END + WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayName "$(^Name)" + WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayVersion "${VERSION}" + WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" Publisher "${COMPANY}" + WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" URLInfoAbout "${URL}" + WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayIcon $INSTDIR\uninstall.exe + WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" UninstallString $INSTDIR\uninstall.exe + WriteRegDWORD HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoModify 1 + WriteRegDWORD HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoRepair 1 +SectionEnd + +# Macro for selecting uninstaller sections +!macro SELECT_UNSECTION SECTION_NAME UNSECTION_ID + Push $R0 + ReadRegStr $R0 HKLM "${REGKEY}\Components" "${SECTION_NAME}" + StrCmp $R0 1 0 next${UNSECTION_ID} + !insertmacro SelectSection "${UNSECTION_ID}" + GoTo done${UNSECTION_ID} +next${UNSECTION_ID}: + !insertmacro UnselectSection "${UNSECTION_ID}" +done${UNSECTION_ID}: + Pop $R0 +!macroend + +# Uninstaller sections +Section "-un.Easybox v5" UNSEC0000 + IfFileExists $INSTDIR\EasyBox.exe 0 +32 + ExecWait '"$INSTDIR\EasyBox.exe" -CloseAll' + DetailPrint "Fermeture de Easybox (15 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (14 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (13 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (12 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (11 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (10 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (9 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (8 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (7 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (6 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (5 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (4 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (3 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (2 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (1 sec)..." + Sleep 1000 + + Delete "$INSTDIR\*" + RMDir /r /REBOOTOK $INSTDIR + DeleteRegValue HKLM "${REGKEY}\Components" "Easybox v5" +SectionEnd + +Section "-un.Lancer au d\xE9marrage" UNSEC0001 + DeleteRegValue HKLM "Software\Microsoft\Windows\CurrentVersion\Run" "Easybox" +SectionEnd + +Section -un.post UNSEC0002 + DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" + + IfFileExists $INSTDIR\EasyBox.exe 0 +32 + ExecWait '"$INSTDIR\EasyBox.exe" -CloseAll' + DetailPrint "Fermeture de Easybox (15 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (14 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (13 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (12 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (11 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (10 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (9 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (8 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (7 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (6 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (5 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (4 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (3 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (2 sec)..." + Sleep 1000 + DetailPrint "Fermeture de Easybox (1 sec)..." + Sleep 1000 + + Delete "$INSTDIR\*" + RMDir /r /REBOOTOK $INSTDIR + DeleteRegValue HKLM "${REGKEY}\Components" "Easybox v5" + DeleteRegValue HKLM "Software\Microsoft\Windows\CurrentVersion\Run" "Easybox" + + Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\Uninstall $(^Name).lnk" + Delete /REBOOTOK $INSTDIR\uninstall.exe + DeleteRegValue HKLM "${REGKEY}" StartMenuGroup + DeleteRegValue HKLM "${REGKEY}" Path + DeleteRegKey /IfEmpty HKLM "${REGKEY}\Components" + DeleteRegKey /IfEmpty HKLM "${REGKEY}" + RmDir /REBOOTOK $SMPROGRAMS\$StartMenuGroup + RmDir /REBOOTOK $INSTDIR +SectionEnd + +# Installer functions +Function .onInit + InitPluginsDir +FunctionEnd + +# Uninstaller functions +Function un.onInit + ReadRegStr $INSTDIR HKLM "${REGKEY}" Path + !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuGroup + !insertmacro SELECT_UNSECTION Easybox ${UNSEC0000} + !insertmacro SELECT_UNSECTION "Lancer avec Windows" ${UNSEC0001} +FunctionEnd + +# Section Descriptions +!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN +!insertmacro MUI_DESCRIPTION_TEXT ${SEC0000} "Le core d'Easybox v5" +!insertmacro MUI_DESCRIPTION_TEXT ${SEC0001} "Voulez-vous lancer Easybox en m\xEAme temps que Windows ?" +!insertmacro MUI_FUNCTION_DESCRIPTION_END + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ara...@us...> - 2008-08-20 15:50:19
|
Revision: 225 http://easybox-mod.svn.sourceforge.net/easybox-mod/?rev=225&view=rev Author: aragornis Date: 2008-08-20 15:50:13 +0000 (Wed, 20 Aug 2008) Log Message: ----------- Removed Paths: ------------- trunk/http/Thumbs.db trunk/http/creerarchive.php trunk/http/dummy.php trunk/http/setup.nsi Property Changed: ---------------- trunk/http/_utilisateur/ trunk/http/_utilisateur/cache/ Property changes on: trunk/http/_utilisateur ___________________________________________________________________ Added: svn:ignore + cache.db video.db configuration.ini podcast.db rss.db audio.db utilisateur.db records.db Property changes on: trunk/http/_utilisateur/cache ___________________________________________________________________ Added: svn:ignore + * * * * * * Deleted: trunk/http/creerarchive.php =================================================================== --- trunk/http/creerarchive.php 2008-08-20 12:06:39 UTC (rev 224) +++ trunk/http/creerarchive.php 2008-08-20 15:50:13 UTC (rev 225) @@ -1,36 +0,0 @@ -<?php - -$var = 'trunk/_framework/framework.php - trunk/_framework/lib/Photo.class.php - trunk/_utilisateur/modules.db - trunk/version.html'; - -$res = explode(' - ',$var); - -function mkpath($path) - { - $dirs=array(); - $path=preg_replace('/(\/){2,}|(\\\){1,}/','/',$path); //only forward-slash - $dirs=explode("/",$path); - $path=""; - foreach ($dirs as $element) - { - $path.=$element."/"; - if(!is_dir($path)) - { - if(!mkdir($path)){ echo "something was wrong at : ".$path."<br>"; return 0; } - } - } - //echo("<B>".$path."</B> successfully created"); - } - -foreach($res as $f){ - $f2 = str_replace('trunk/','',$f); - //echo 'export\\'.dirname($f2).'<br>'; - mkpath('export/'.dirname($f2)); - copy($f2,'export/'.$f2); -} - - -?> Deleted: trunk/http/dummy.php =================================================================== --- trunk/http/dummy.php 2008-08-20 12:06:39 UTC (rev 224) +++ trunk/http/dummy.php 2008-08-20 15:50:13 UTC (rev 225) @@ -1,3 +0,0 @@ -<?php - -?> \ No newline at end of file Deleted: trunk/http/setup.nsi =================================================================== --- trunk/http/setup.nsi 2008-08-20 12:06:39 UTC (rev 224) +++ trunk/http/setup.nsi 2008-08-20 15:50:13 UTC (rev 225) @@ -1,354 +0,0 @@ -# Auto-generated by EclipseNSIS Script Wizard -# 3 ao\xFBt 2008 13:08:24 - -Name Easybox - -# Defines -!define REGKEY "SOFTWARE\$(^Name)" -!define VERSION "5.0.0-alpha" -!define COMPANY "Easybox Team" -!define URL http://www.easybox-freeplayer.com - -# MUI defines -!define MUI_ICON ..\EasyBox.ico -!define MUI_FINISHPAGE_NOAUTOCLOSE -!define MUI_STARTMENUPAGE_REGISTRY_ROOT HKLM -!define MUI_STARTMENUPAGE_NODISABLE -!define MUI_STARTMENUPAGE_REGISTRY_KEY ${REGKEY} -!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME StartMenuGroup -!define MUI_STARTMENUPAGE_DEFAULTFOLDER Easybox -!define MUI_FINISHPAGE_RUN $INSTDIR\EasyBox.exe -!define MUI_FINISHPAGE_RUN_PARAMETERS -StartAndConfig -!define MUI_UNICON ..\EasyBox2.ico -!define MUI_UNFINISHPAGE_NOAUTOCLOSE - -ComponentText "Selectionnez les parties d'Easybox \xE0 installer.." - -# Included files -!include Sections.nsh -!include MUI.nsh - -# Variables -Var StartMenuGroup - -# Installer pages -!insertmacro MUI_PAGE_WELCOME -!insertmacro MUI_PAGE_LICENSE ..\Readme.txt -!insertmacro MUI_PAGE_DIRECTORY -!insertmacro MUI_PAGE_STARTMENU Application $StartMenuGroup -!insertmacro MUI_PAGE_COMPONENTS -!insertmacro MUI_PAGE_INSTFILES -!insertmacro MUI_PAGE_FINISH -!insertmacro MUI_UNPAGE_CONFIRM -!insertmacro MUI_UNPAGE_INSTFILES - -# Installer languages -!insertmacro MUI_LANGUAGE French - -# Installer attributes -OutFile ..\Easybox.win.5.0.0.exe -InstallDir $PROGRAMFILES\Easybox -CRCCheck on -XPStyle on -ShowInstDetails show -VIProductVersion "5.0.0.0" -VIAddVersionKey ProductName Easybox -VIAddVersionKey ProductVersion "${VERSION}" -VIAddVersionKey CompanyName "${COMPANY}" -VIAddVersionKey CompanyWebsite "${URL}" -VIAddVersionKey FileVersion "${VERSION}" -VIAddVersionKey FileDescription "" -VIAddVersionKey LegalCopyright "" -InstallDirRegKey HKLM "${REGKEY}" Path -ShowUninstDetails show - -# Installer sections -Section "!Easybox v5" SEC0000 - IfFileExists $INSTDIR\EasyBox.exe 0 +32 - ExecWait '"$INSTDIR\EasyBox.exe" -CloseAll' - DetailPrint "Fermeture de Easybox (15 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (14 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (13 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (12 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (11 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (10 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (9 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (8 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (7 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (6 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (5 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (4 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (3 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (2 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (1 sec)..." - Sleep 1000 - - SetOutPath $INSTDIR\http - SetOverwrite on - File /r /x _utilisateur /x %%*%%* /x .cache /x .settings /x .project * - SetOutPath $INSTDIR\http\_utilisateur - File /r /x *.db /x *.ini /x *.db /x contentVLC /x *.gif /x *.png /x *.jpg /x *.m3u _utilisateur\*.* - File ..\http\_utilisateur\modules.db - File ..\http\_utilisateur\podcast.db - SetOutPath $INSTDIR\php5 - File /r ..\php5\* - SetOutPath $INSTDIR\apache - File /r /x error.log ..\apache\* - SetOutPath $INSTDIR\vlc - File /r ..\vlc\* - SetOutPath $INSTDIR - File ..\lanceur.ver - File ..\NtRights.exe - File ..\RunURL.exe - File ..\SC.exe - File ..\SrvAny.exe - File ..\VLCApp.pid - File ..\VLCSvc.pid - File ..\About.dat - File ..\AConf.dat - File ..\apache.conf - File ..\CUsrMgr.exe - File ..\easybox - File ..\EasyBox.exe - File ..\EasyBox.ico - File ..\EasyBox.jpg - File ..\EasyBox2.ico - File ..\Files.dat - File ..\InstSrv.exe - - WriteINIStr $INSTDIR\Easybox.cfg EasyBox VLauncher 1.3.0.7 - WriteINIStr $INSTDIR\Easybox.cfg EasyBox ModName EasyBox - WriteINIStr $INSTDIR\Easybox.cfg EasyBox ModVersion 5.0 - WriteINIStr $INSTDIR\Easybox.cfg EasyBox IconName EasyBox.ico - WriteINIStr $INSTDIR\Easybox.cfg EasyBox OutOfOrderIcon EasyBox2.ico - WriteINIStr $INSTDIR\Easybox.cfg EasyBox ModPath $INSTDIR - WriteINIStr $INSTDIR\Easybox.cfg EasyBox IniModFile EasyBox.ini - WriteINIStr $INSTDIR\Easybox.cfg EasyBox SplashScreen 1 - WriteINIStr $INSTDIR\Easybox.cfg EasyBox SplashImage EasyBox.jpg - WriteINIStr $INSTDIR\Easybox.cfg EasyBox ApacheTemplateFile AConf.dat - WriteINIStr $INSTDIR\Easybox.cfg EasyBox AboutWindowFile About.dat - WriteINIStr $INSTDIR\Easybox.cfg EasyBox ListFile Files.dat - WriteINIStr $INSTDIR\Easybox.cfg EasyBox VLCDefaultFile easybox-defaut - WriteINIStr $INSTDIR\EasyBox.ini VLC VLCPath $INSTDIR\VLC\VLC.exe - WriteINIStr $INSTDIR\EasyBox.ini VLC VlcShowWindow 0 - WriteINIStr $INSTDIR\EasyBox.ini VLC VlcParameters `--config="easybox" --intf=http --http-src="$INSTDIR\http\http-vlc" --http-host=:8081` - WriteINIStr $INSTDIR\EasyBox.ini VLC RunAsService 0 - WriteINIStr $INSTDIR\EasyBox.ini VLC VLCStopCommand "http://localhost:8081/lecteur/action.html?control=shutdown" - WriteINIStr $INSTDIR\EasyBox.ini VLC VLCLoggerOn 0 - WriteINIStr $INSTDIR\EasyBox.ini VLC VLCDnldURL "http://www.easybox-freeplayer.com/vlc.zip" - WriteINIStr $INSTDIR\EasyBox.ini VLC VLCStatusPage "http://localhost:8081/status.html" - WriteINIStr $INSTDIR\EasyBox.ini VLC VLCConfigFile "easybox" - WriteINIStr $INSTDIR\EasyBox.ini VLC VLCUpdURL "http://www.easybox-freeplayer.com/vlc.ver" - WriteINIStr $INSTDIR\EasyBox.ini Apache ApachePath "$INSTDIR\Apache\Apache.exe" - WriteINIStr $INSTDIR\EasyBox.ini Apache ApacheConf "$INSTDIR\apache.conf" - WriteINIStr $INSTDIR\EasyBox.ini Apache AllowedIP "127.0.0.1;192.168.;212.27." - WriteINIStr $INSTDIR\EasyBox.ini Apache WebPagePath "$INSTDIR\http" - WriteINIStr $INSTDIR\EasyBox.ini Apache ApachePort 8080 - WriteINIStr $INSTDIR\EasyBox.ini Apache ApacheStatusPage "http://localhost:8080/status.html" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox ModConfig "http://localhost:8080/configuration/configuration.php" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox AutoRun 0 - WriteINIStr $INSTDIR\EasyBox.ini EasyBox AccountType "system" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox SvcAccount ".\MonCompte" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox PWDAccount "39F972DAC98F9AAE720A66CDF23E5B7F" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox ModDnldURL "http://www.easybox-freeplayer.com/easybox.zip" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox ModUpdURL "http://www.easybox-freeplayer.com/lanceur.ver" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox MultiposteURL "http://mafreebox.freebox.fr/freeboxtv/playlist.m3u" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox MultipostePath "\http\_utilisateur\multiposte.m3u" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox MapDrivePath "\http\_utilisateur" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox MapDriveURLPath "http://localhost:8080/_utilisateur" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox LogModOn 0 - WriteINIStr $INSTDIR\EasyBox.ini EasyBox NetLetter1 "" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox NetLetter2 "" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox NetLetter3 "" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox NetLetter4 "" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox NetLetter5 "" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox NetLetter6 "" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox NetLetter7 "" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox NetLetter8 "" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox NetLetter9 "" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox NetLetter10 "" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox UncPath1 "" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox UncPath2 "" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox UncPath3 "" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox UncPath4 "" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox UncPath5 "" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox UncPath6 "" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox UncPath7 "" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox UncPath8 "" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox UncPath9 "" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox UncPath10 "" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox ScheduledPage1 "97|http://localhost:8080/configuration/scan_video.php?scan=1" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox ScheduledPage2 "89|http://localhost:8080/configuration/scan_video.php?get_info=1&research=1" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox ScheduledPage3 "83|http://localhost:8080/configuration/scan_video.php?get_celebrites=1&research=1" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox ScheduledPage4 "" - WriteINIStr $INSTDIR\EasyBox.ini EasyBox ScheduledPage5 "" - - WriteRegStr HKLM "${REGKEY}\Components" "Easybox v5" 1 -SectionEnd - -Section "Lancer au d\xE9marrage" SEC0001 - WriteINIStr $INSTDIR\EasyBox.ini EasyBox AutoRun 1 - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Run" "Easybox" "$INSTDIR\EasyBox.exe" -SectionEnd - -Section -post SEC0002 - WriteRegStr HKLM "${REGKEY}" Path $INSTDIR - SetOutPath $INSTDIR - WriteUninstaller $INSTDIR\uninstall.exe - !insertmacro MUI_STARTMENU_WRITE_BEGIN Application - SetOutPath $SMPROGRAMS\$StartMenuGroup - CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Uninstall $(^Name).lnk" $INSTDIR\uninstall.exe - CreateShortcut "$SMPROGRAMS\$StartMenuGroup\$(^Name).lnk" "$INSTDIR\Easybox.exe" - CreateShortcut "$SMPROGRAMS\$StartMenuGroup\$(^Name).lnk" "$INSTDIR\Easybox.exe" "-Config" - !insertmacro MUI_STARTMENU_WRITE_END - WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayName "$(^Name)" - WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayVersion "${VERSION}" - WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" Publisher "${COMPANY}" - WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" URLInfoAbout "${URL}" - WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayIcon $INSTDIR\uninstall.exe - WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" UninstallString $INSTDIR\uninstall.exe - WriteRegDWORD HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoModify 1 - WriteRegDWORD HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoRepair 1 -SectionEnd - -# Macro for selecting uninstaller sections -!macro SELECT_UNSECTION SECTION_NAME UNSECTION_ID - Push $R0 - ReadRegStr $R0 HKLM "${REGKEY}\Components" "${SECTION_NAME}" - StrCmp $R0 1 0 next${UNSECTION_ID} - !insertmacro SelectSection "${UNSECTION_ID}" - GoTo done${UNSECTION_ID} -next${UNSECTION_ID}: - !insertmacro UnselectSection "${UNSECTION_ID}" -done${UNSECTION_ID}: - Pop $R0 -!macroend - -# Uninstaller sections -Section "-un.Easybox v5" UNSEC0000 - IfFileExists $INSTDIR\EasyBox.exe 0 +32 - ExecWait '"$INSTDIR\EasyBox.exe" -CloseAll' - DetailPrint "Fermeture de Easybox (15 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (14 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (13 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (12 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (11 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (10 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (9 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (8 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (7 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (6 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (5 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (4 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (3 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (2 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (1 sec)..." - Sleep 1000 - - Delete "$INSTDIR\*" - RMDir /r /REBOOTOK $INSTDIR - DeleteRegValue HKLM "${REGKEY}\Components" "Easybox v5" -SectionEnd - -Section "-un.Lancer au d\xE9marrage" UNSEC0001 - DeleteRegValue HKLM "Software\Microsoft\Windows\CurrentVersion\Run" "Easybox" -SectionEnd - -Section -un.post UNSEC0002 - DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" - - IfFileExists $INSTDIR\EasyBox.exe 0 +32 - ExecWait '"$INSTDIR\EasyBox.exe" -CloseAll' - DetailPrint "Fermeture de Easybox (15 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (14 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (13 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (12 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (11 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (10 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (9 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (8 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (7 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (6 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (5 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (4 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (3 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (2 sec)..." - Sleep 1000 - DetailPrint "Fermeture de Easybox (1 sec)..." - Sleep 1000 - - Delete "$INSTDIR\*" - RMDir /r /REBOOTOK $INSTDIR - DeleteRegValue HKLM "${REGKEY}\Components" "Easybox v5" - DeleteRegValue HKLM "Software\Microsoft\Windows\CurrentVersion\Run" "Easybox" - - Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\Uninstall $(^Name).lnk" - Delete /REBOOTOK $INSTDIR\uninstall.exe - DeleteRegValue HKLM "${REGKEY}" StartMenuGroup - DeleteRegValue HKLM "${REGKEY}" Path - DeleteRegKey /IfEmpty HKLM "${REGKEY}\Components" - DeleteRegKey /IfEmpty HKLM "${REGKEY}" - RmDir /REBOOTOK $SMPROGRAMS\$StartMenuGroup - RmDir /REBOOTOK $INSTDIR -SectionEnd - -# Installer functions -Function .onInit - InitPluginsDir -FunctionEnd - -# Uninstaller functions -Function un.onInit - ReadRegStr $INSTDIR HKLM "${REGKEY}" Path - !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuGroup - !insertmacro SELECT_UNSECTION Easybox ${UNSEC0000} - !insertmacro SELECT_UNSECTION "Lancer avec Windows" ${UNSEC0001} -FunctionEnd - -# Section Descriptions -!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN -!insertmacro MUI_DESCRIPTION_TEXT ${SEC0000} "Le core d'Easybox v5" -!insertmacro MUI_DESCRIPTION_TEXT ${SEC0001} "Voulez-vous lancer Easybox en m\xEAme temps que Windows ?" -!insertmacro MUI_FUNCTION_DESCRIPTION_END - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ara...@us...> - 2008-08-20 12:06:45
|
Revision: 224 http://easybox-mod.svn.sourceforge.net/easybox-mod/?rev=224&view=rev Author: aragornis Date: 2008-08-20 12:06:39 +0000 (Wed, 20 Aug 2008) Log Message: ----------- Removed Paths: ------------- trunk/http/_utilisateur/cache/372a47836e968a0ee2e997bc68759eb7 trunk/http/_utilisateur/cache/3bddc806f00348f0817d0ea8dfcb660c.gif trunk/http/_utilisateur/cache/52c5e407ccf53040d2582808a3e106d6 trunk/http/_utilisateur/cache/824ae8f4415a1db7960a2dbcdeb46b4c.gif trunk/http/_utilisateur/cache/Thumbs.db trunk/http/_utilisateur/cache/ac2af59612a9ca9cd2983c406c235afe.gif trunk/http/_utilisateur/cache/b66ed9010e9f4bd81912f8e5dd6935af.gif trunk/http/_utilisateur/cache/e9f2c9d80bb32b1a0a58f9213b7604e1.gif trunk/http/_utilisateur/cache/ed7a5bc0e924f3d30c71633de58b9373.gif Deleted: trunk/http/_utilisateur/cache/372a47836e968a0ee2e997bc68759eb7 =================================================================== --- trunk/http/_utilisateur/cache/372a47836e968a0ee2e997bc68759eb7 2008-08-20 09:49:53 UTC (rev 223) +++ trunk/http/_utilisateur/cache/372a47836e968a0ee2e997bc68759eb7 2008-08-20 12:06:39 UTC (rev 224) @@ -1,186 +0,0 @@ -<?xml version="1.0" encoding="iso-8859-1" ?> -<rss xmlns:msxsl="urn:schemas-microsoft-com:xslt" xmlns:itunes="http://www.itunes.com/DTDs/Podcast-1.0.dtd" version="2.0"> -<channel> -<title>i>TELE, le journal</title> -<itunes:author>iTELE</itunes:author> -<link>http://www.itele.fr</link> -<description>Le journal d'i>TELE, la cha\xEEne d'information en continu par c\xE2ble, satellite, mobile et TNT</description> -<language>FR</language> -<copyright>i>TELE 2006</copyright> -<managingEditor></managingEditor> -<webMaster></webMaster> -<pubDate>Sun, 03 Aug 2008 13:00:01 +0100</pubDate> -<lastBuildDate>Sun, 03 Aug 2008 13:00:01 +0100</lastBuildDate> -<category>News</category> -<generator>Streamakaci</generator> -<ttl>60</ttl> -<image><url>http://podcast121.streamakaci.com/iTELE/images/iTele_Triangle_rouge.gif</url> -<title>I>TELE, LE JOURNAL</title> -<link>http://www.itele.fr</link> -<width>300</width> -<height>300</height> -</image> -<itunes:image href="http://podcast121.streamakaci.com/iTELE/images/iTele_Triangle_rouge.gif"/><item> -<title>i> TELE, l'\xE9dition de la mi-journ\xE9e du 03/08/2008</title> -<link>http://www.itele.fr</link> -<description>Le journal d'i>TELE, la cha\xEEne d'information en continu par c\xE2ble, satellite, mobile et TNT</description> -<author>iTELE</author> -<category>News</category> -<enclosure url="http://podcast121.streamakaci.com/iTELE/iTELElejournal_20080803_midi.mp4" length="29151675" type="video/mpeg"/> -<guid>http://podcast121.streamakaci.com/iTELE/iTELElejournal_20080803_midi.mp4</guid> -<pubDate>August 03 2008 12:35:24</pubDate><source url="http://podcast12.streamakaci.com/iTELE/iTELElejournal.xml"></source> -<itunes:category text="News"> -</itunes:category> -<itunes:explicit>No</itunes:explicit> -<itunes:subtitle>Le journal d'I>TELE, la cha\xEEne d'information en continu</itunes:subtitle> -<itunes:summary></itunes:summary> -<itunes:author>iTELE</itunes:author> -<itunes:duration>15:00</itunes:duration> -<itunes:keywords>flash, jt, information, itele, actualit\xE9, news, journal, i>tele, itv, info, Thomas, Hugues, \xE9dition, soir, mi-journ\xE9e, midi, matin, i>matin, \xE9dition du soir, 18h00, 1h30 chrono, 1h30, Claire, Elisabeth, Beaufort, 7h00,12h00</itunes:keywords> -<itunes:owner> -<itunes:name>iTELE</itunes:name> -<itunes:email></itunes:email> -</itunes:owner><image><url>http://podcast121.streamakaci.com/iTELE/images/iTele_Triangle_rouge.gif</url> -<title>I>TELE, LE JOURNAL</title> -<link>http://www.itele.fr</link> -<width>300</width> -<height>300</height> -</image> -<itunes:image href="http://podcast121.streamakaci.com/iTELE/images/iTele_Triangle_rouge.gif"/></item> -<item> -<title>i> TELE, l'\xE9dition de la mi-journ\xE9e du 02/08/2008</title> -<link>http://www.itele.fr</link> -<description>Le journal d'i>TELE, la cha\xEEne d'information en continu par c\xE2ble, satellite, mobile et TNT</description> -<author>iTELE</author> -<category>News</category> -<enclosure url="http://podcast121.streamakaci.com/iTELE/iTELElejournal_20080802_midi.mp4" length="30655720" type="video/mpeg"/> -<guid>http://podcast121.streamakaci.com/iTELE/iTELElejournal_20080802_midi.mp4</guid> -<pubDate>August 02 2008 12:35:25</pubDate><source url="http://podcast12.streamakaci.com/iTELE/iTELElejournal.xml"></source> -<itunes:category text="News"> -</itunes:category> -<itunes:explicit>No</itunes:explicit> -<itunes:subtitle>Le journal d'I>TELE, la cha\xEEne d'information en continu</itunes:subtitle> -<itunes:summary></itunes:summary> -<itunes:author>iTELE</itunes:author> -<itunes:duration>15:00</itunes:duration> -<itunes:keywords>flash, jt, information, itele, actualit\xE9, news, journal, i>tele, itv, info, Thomas, Hugues, \xE9dition, soir, mi-journ\xE9e, midi, matin, i>matin, \xE9dition du soir, 18h00, 1h30 chrono, 1h30, Claire, Elisabeth, Beaufort, 7h00,12h00</itunes:keywords> -<itunes:owner> -<itunes:name>iTELE</itunes:name> -<itunes:email></itunes:email> -</itunes:owner><image><url>http://podcast121.streamakaci.com/iTELE/images/iTele_Triangle_rouge.gif</url> -<title>I>TELE, LE JOURNAL</title> -<link>http://www.itele.fr</link> -<width>300</width> -<height>300</height> -</image> -<itunes:image href="http://podcast121.streamakaci.com/iTELE/images/iTele_Triangle_rouge.gif"/></item> -<item> -<title>i> TELE, l'\xE9dition du soir du 01/08/2008</title> -<link>http://www.itele.fr</link> -<description>Le journal d'i>TELE, la cha\xEEne d'information en continu par c\xE2ble, satellite, mobile et TNT</description> -<author>iTELE</author> -<category>News</category> -<enclosure url="http://podcast121.streamakaci.com/iTELE/iTELElejournal_20080801_soir.mp4" length="32741325" type="video/mpeg"/> -<guid>http://podcast121.streamakaci.com/iTELE/iTELElejournal_20080801_soir.mp4</guid> -<pubDate>August 01 2008 18:30:25</pubDate><source url="http://podcast12.streamakaci.com/iTELE/iTELElejournal.xml"></source> -<itunes:category text="News"> -</itunes:category> -<itunes:explicit>No</itunes:explicit> -<itunes:subtitle>Le journal d'I>TELE, la cha\xEEne d'information en continu</itunes:subtitle> -<itunes:summary></itunes:summary> -<itunes:author>iTELE</itunes:author> -<itunes:duration>15:00</itunes:duration> -<itunes:keywords>flash, jt, information, itele, actualit\xE9, news, journal, i>tele, itv, info, Thomas, Hugues, \xE9dition, soir, mi-journ\xE9e, midi, matin, i>matin, \xE9dition du soir, 18h00, 1h30 chrono, 1h30, Claire, Elisabeth, Beaufort, 7h00,12h00</itunes:keywords> -<itunes:owner> -<itunes:name>iTELE</itunes:name> -<itunes:email></itunes:email> -</itunes:owner><image><url>http://podcast121.streamakaci.com/iTELE/images/iTele_Triangle_rouge.gif</url> -<title>I>TELE, LE JOURNAL</title> -<link>http://www.itele.fr</link> -<width>300</width> -<height>300</height> -</image> -<itunes:image href="http://podcast121.streamakaci.com/iTELE/images/iTele_Triangle_rouge.gif"/></item> -<item> -<title>i> TELE, l'\xE9dition de la mi-journ\xE9e du 01/08/2008</title> -<link>http://www.itele.fr</link> -<description>Le journal d'i>TELE, la cha\xEEne d'information en continu par c\xE2ble, satellite, mobile et TNT</description> -<author>iTELE</author> -<category>News</category> -<enclosure url="http://podcast121.streamakaci.com/iTELE/iTELElejournal_20080801_midi.mp4" length="31785378" type="video/mpeg"/> -<guid>http://podcast121.streamakaci.com/iTELE/iTELElejournal_20080801_midi.mp4</guid> -<pubDate>August 01 2008 12:40:27</pubDate><source url="http://podcast12.streamakaci.com/iTELE/iTELElejournal.xml"></source> -<itunes:category text="News"> -</itunes:category> -<itunes:explicit>No</itunes:explicit> -<itunes:subtitle>Le journal d'I>TELE, la cha\xEEne d'information en continu</itunes:subtitle> -<itunes:summary></itunes:summary> -<itunes:author>iTELE</itunes:author> -<itunes:duration>15:00</itunes:duration> -<itunes:keywords>flash, jt, information, itele, actualit\xE9, news, journal, i>tele, itv, info, Thomas, Hugues, \xE9dition, soir, mi-journ\xE9e, midi, matin, i>matin, \xE9dition du soir, 18h00, 1h30 chrono, 1h30, Claire, Elisabeth, Beaufort, 7h00,12h00</itunes:keywords> -<itunes:owner> -<itunes:name>iTELE</itunes:name> -<itunes:email></itunes:email> -</itunes:owner><image><url>http://podcast121.streamakaci.com/iTELE/images/iTele_Triangle_rouge.gif</url> -<title>I>TELE, LE JOURNAL</title> -<link>http://www.itele.fr</link> -<width>300</width> -<height>300</height> -</image> -<itunes:image href="http://podcast121.streamakaci.com/iTELE/images/iTele_Triangle_rouge.gif"/></item> -<item> -<title>i> TELE, l'\xE9dition du matin du 01/08/2008</title> -<link>http://www.itele.fr</link> -<description>Le journal d'i>TELE, la cha\xEEne d'information en continu par c\xE2ble, satellite, mobile et TNT</description> -<author>iTELE</author> -<category>News</category> -<enclosure url="http://podcast121.streamakaci.com/iTELE/iTELElejournal_20080801_matin.mp4" length="31071108" type="video/mpeg"/> -<guid>http://podcast121.streamakaci.com/iTELE/iTELElejournal_20080801_matin.mp4</guid> -<pubDate>August 01 2008 08:25:25</pubDate><source url="http://podcast12.streamakaci.com/iTELE/iTELElejournal.xml"></source> -<itunes:category text="News"> -</itunes:category> -<itunes:explicit>No</itunes:explicit> -<itunes:subtitle>Le journal d'I>TELE, la cha\xEEne d'information en continu</itunes:subtitle> -<itunes:summary></itunes:summary> -<itunes:author>iTELE</itunes:author> -<itunes:duration>15:00</itunes:duration> -<itunes:keywords>flash, jt, information, itele, actualit\xE9, news, journal, i>tele, itv, info, Thomas, Hugues, \xE9dition, soir, mi-journ\xE9e, midi, matin, i>matin, \xE9dition du soir, 18h00, 1h30 chrono, 1h30, Claire, Elisabeth, Beaufort, 7h00,12h00</itunes:keywords> -<itunes:owner> -<itunes:name>iTELE</itunes:name> -<itunes:email></itunes:email> -</itunes:owner><image><url>http://podcast121.streamakaci.com/iTELE/images/iTele_Triangle_rouge.gif</url> -<title>I>TELE, LE JOURNAL</title> -<link>http://www.itele.fr</link> -<width>300</width> -<height>300</height> -</image> -<itunes:image href="http://podcast121.streamakaci.com/iTELE/images/iTele_Triangle_rouge.gif"/></item> -<item> -<title>i> TELE, l'\xE9dition du soir du 31/07/2008</title> -<link>http://www.itele.fr</link> -<description>Le journal d'i>TELE, la cha\xEEne d'information en continu par c\xE2ble, satellite, mobile et TNT</description> -<author>iTELE</author> -<category>News</category> -<enclosure url="http://podcast121.streamakaci.com/iTELE/iTELElejournal_20080731_soir.mp4" length="31375781" type="video/mpeg"/> -<guid>http://podcast121.streamakaci.com/iTELE/iTELElejournal_20080731_soir.mp4</guid> -<pubDate>July 31 2008 18:40:23</pubDate><source url="http://podcast12.streamakaci.com/iTELE/iTELElejournal.xml"></source> -<itunes:category text="News"> -</itunes:category> -<itunes:explicit>No</itunes:explicit> -<itunes:subtitle>Le journal d'I>TELE, la cha\xEEne d'information en continu</itunes:subtitle> -<itunes:summary></itunes:summary> -<itunes:author>iTELE</itunes:author> -<itunes:duration>15:00</itunes:duration> -<itunes:keywords>flash, jt, information, itele, actualit\xE9, news, journal, i>tele, itv, info, Thomas, Hugues, \xE9dition, soir, mi-journ\xE9e, midi, matin, i>matin, \xE9dition du soir, 18h00, 1h30 chrono, 1h30, Claire, Elisabeth, Beaufort, 7h00,12h00</itunes:keywords> -<itunes:owner> -<itunes:name>iTELE</itunes:name> -<itunes:email></itunes:email> -</itunes:owner><image><url>http://podcast121.streamakaci.com/iTELE/images/iTele_Triangle_rouge.gif</url> -<title>I>TELE, LE JOURNAL</title> -<link>http://www.itele.fr</link> -<width>300</width> -<height>300</height> -</image> -<itunes:image href="http://podcast121.streamakaci.com/iTELE/images/iTele_Triangle_rouge.gif"/></item> -</channel> -</rss> Deleted: trunk/http/_utilisateur/cache/52c5e407ccf53040d2582808a3e106d6 =================================================================== --- trunk/http/_utilisateur/cache/52c5e407ccf53040d2582808a3e106d6 2008-08-20 09:49:53 UTC (rev 223) +++ trunk/http/_utilisateur/cache/52c5e407ccf53040d2582808a3e106d6 2008-08-20 12:06:39 UTC (rev 224) @@ -1,152 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1" ?> -<rss version="2.0"> - <channel> - <title>Le Journal de 20h sur TF1</title> - <link>http://www.tf1.fr</link> - <description><![CDATA[Le Journal de 20h sur TF1]]></description> - <language>fr</language> - <image> - <url>http://membres.lycos.fr/widget64/podcast/logo_tf1.gif</url> - </image> - <item> - <title><![CDATA[Journal :02/08/2008]]></title> - <link><![CDATA[http://s.tf1.fr/FluxJt/jt20d02082008/jt20d02082008.asx]]></link> - <pubDate>Sat, 02 Aug 2008 00:00:00 +0200</pubDate> - <description><![CDATA[Le Journal de 20h sur TF1]]></description> - <enclosure url="http://s.tf1.fr/FluxJt/jt20d02082008/jt20d02082008.asx" length="" type="video/x-ms-wmv"/> - </item> - <item> - <title><![CDATA[Journal :01/08/2008]]></title> - <link><![CDATA[http://s.tf1.fr/FluxJt/jt20d01082008/jt20d01082008.asx]]></link> - <pubDate>Fri, 01 Aug 2008 00:00:00 +0200</pubDate> - <description><![CDATA[Le Journal de 20h sur TF1]]></description> - <enclosure url="http://s.tf1.fr/FluxJt/jt20d01082008/jt20d01082008.asx" length="" type="video/x-ms-wmv"/> - </item> - <item> - <title><![CDATA[Journal :31/07/2008]]></title> - <link><![CDATA[http://s.tf1.fr/FluxJt/jt20d31072008/jt20d31072008.asx]]></link> - <pubDate>Thu, 31 Jul 2008 00:00:00 +0200</pubDate> - <description><![CDATA[Le Journal de 20h sur TF1]]></description> - <enclosure url="http://s.tf1.fr/FluxJt/jt20d31072008/jt20d31072008.asx" length="" type="video/x-ms-wmv"/> - </item> - <item> - <title><![CDATA[Journal :30/07/2008]]></title> - <link><![CDATA[http://s.tf1.fr/FluxJt/jt20d30072008/jt20d30072008.asx]]></link> - <pubDate>Wed, 30 Jul 2008 00:00:00 +0200</pubDate> - <description><![CDATA[Le Journal de 20h sur TF1]]></description> - <enclosure url="http://s.tf1.fr/FluxJt/jt20d30072008/jt20d30072008.asx" length="" type="video/x-ms-wmv"/> - </item> - <item> - <title><![CDATA[Journal :29/07/2008]]></title> - <link><![CDATA[http://s.tf1.fr/FluxJt/jt20d29072008/jt20d29072008.asx]]></link> - <pubDate>Tue, 29 Jul 2008 00:00:00 +0200</pubDate> - <description><![CDATA[Le Journal de 20h sur TF1]]></description> - <enclosure url="http://s.tf1.fr/FluxJt/jt20d29072008/jt20d29072008.asx" length="" type="video/x-ms-wmv"/> - </item> - <item> - <title><![CDATA[Journal :28/07/2008]]></title> - <link><![CDATA[http://s.tf1.fr/FluxJt/jt20d28072008/jt20d28072008.asx]]></link> - <pubDate>Mon, 28 Jul 2008 00:00:00 +0200</pubDate> - <description><![CDATA[Le Journal de 20h sur TF1]]></description> - <enclosure url="http://s.tf1.fr/FluxJt/jt20d28072008/jt20d28072008.asx" length="" type="video/x-ms-wmv"/> - </item> - <item> - <title><![CDATA[Journal :27/07/2008]]></title> - <link><![CDATA[http://s.tf1.fr/FluxJt/jt20d27072008/jt20d27072008.asx]]></link> - <pubDate>Sun, 27 Jul 2008 00:00:00 +0200</pubDate> - <description><![CDATA[Le Journal de 20h sur TF1]]></description> - <enclosure url="http://s.tf1.fr/FluxJt/jt20d27072008/jt20d27072008.asx" length="" type="video/x-ms-wmv"/> - </item> - <item> - <title><![CDATA[Journal :26/07/2008]]></title> - <link><![CDATA[http://s.tf1.fr/FluxJt/jt20d26072008/jt20d26072008.asx]]></link> - <pubDate>Sat, 26 Jul 2008 00:00:00 +0200</pubDate> - <description><![CDATA[Le Journal de 20h sur TF1]]></description> - <enclosure url="http://s.tf1.fr/FluxJt/jt20d26072008/jt20d26072008.asx" length="" type="video/x-ms-wmv"/> - </item> - <item> - <title><![CDATA[Journal :25/07/2008]]></title> - <link><![CDATA[http://s.tf1.fr/FluxJt/jt20d25072008/jt20d25072008.asx]]></link> - <pubDate>Fri, 25 Jul 2008 00:00:00 +0200</pubDate> - <description><![CDATA[Le Journal de 20h sur TF1]]></description> - <enclosure url="http://s.tf1.fr/FluxJt/jt20d25072008/jt20d25072008.asx" length="" type="video/x-ms-wmv"/> - </item> - <item> - <title><![CDATA[Journal :24/07/2008]]></title> - <link><![CDATA[http://s.tf1.fr/FluxJt/jt20d24072008/jt20d24072008.asx]]></link> - <pubDate>Thu, 24 Jul 2008 00:00:00 +0200</pubDate> - <description><![CDATA[Le Journal de 20h sur TF1]]></description> - <enclosure url="http://s.tf1.fr/FluxJt/jt20d24072008/jt20d24072008.asx" length="" type="video/x-ms-wmv"/> - </item> - <item> - <title><![CDATA[Journal :23/07/2008]]></title> - <link><![CDATA[http://s.tf1.fr/FluxJt/jt20d23072008/jt20d23072008.asx]]></link> - <pubDate>Wed, 23 Jul 2008 00:00:00 +0200</pubDate> - <description><![CDATA[Le Journal de 20h sur TF1]]></description> - <enclosure url="http://s.tf1.fr/FluxJt/jt20d23072008/jt20d23072008.asx" length="" type="video/x-ms-wmv"/> - </item> - <item> - <title><![CDATA[Journal :22/07/2008]]></title> - <link><![CDATA[http://s.tf1.fr/FluxJt/jt20d22072008/jt20d22072008.asx]]></link> - <pubDate>Tue, 22 Jul 2008 00:00:00 +0200</pubDate> - <description><![CDATA[Le Journal de 20h sur TF1]]></description> - <enclosure url="http://s.tf1.fr/FluxJt/jt20d22072008/jt20d22072008.asx" length="" type="video/x-ms-wmv"/> - </item> - <item> - <title><![CDATA[Journal :21/07/2008]]></title> - <link><![CDATA[http://s.tf1.fr/FluxJt/jt20d21072008/jt20d21072008.asx]]></link> - <pubDate>Mon, 21 Jul 2008 00:00:00 +0200</pubDate> - <description><![CDATA[Le Journal de 20h sur TF1]]></description> - <enclosure url="http://s.tf1.fr/FluxJt/jt20d21072008/jt20d21072008.asx" length="" type="video/x-ms-wmv"/> - </item> - <item> - <title><![CDATA[Journal :20/07/2008]]></title> - <link><![CDATA[http://s.tf1.fr/FluxJt/jt20d20072008/jt20d20072008.asx]]></link> - <pubDate>Sun, 20 Jul 2008 00:00:00 +0200</pubDate> - <description><![CDATA[Le Journal de 20h sur TF1]]></description> - <enclosure url="http://s.tf1.fr/FluxJt/jt20d20072008/jt20d20072008.asx" length="" type="video/x-ms-wmv"/> - </item> - <item> - <title><![CDATA[Journal :19/07/2008]]></title> - <link><![CDATA[http://s.tf1.fr/FluxJt/jt20d19072008/jt20d19072008.asx]]></link> - <pubDate>Sat, 19 Jul 2008 00:00:00 +0200</pubDate> - <description><![CDATA[Le Journal de 20h sur TF1]]></description> - <enclosure url="http://s.tf1.fr/FluxJt/jt20d19072008/jt20d19072008.asx" length="" type="video/x-ms-wmv"/> - </item> - <item> - <title><![CDATA[Journal :18/07/2008]]></title> - <link><![CDATA[http://s.tf1.fr/FluxJt/jt20d18072008/jt20d18072008.asx]]></link> - <pubDate>Fri, 18 Jul 2008 00:00:00 +0200</pubDate> - <description><![CDATA[Le Journal de 20h sur TF1]]></description> - <enclosure url="http://s.tf1.fr/FluxJt/jt20d18072008/jt20d18072008.asx" length="" type="video/x-ms-wmv"/> - </item> - <item> - <title><![CDATA[Journal :17/07/2008]]></title> - <link><![CDATA[http://s.tf1.fr/FluxJt/jt20d17072008/jt20d17072008.asx]]></link> - <pubDate>Thu, 17 Jul 2008 00:00:00 +0200</pubDate> - <description><![CDATA[Le Journal de 20h sur TF1]]></description> - <enclosure url="http://s.tf1.fr/FluxJt/jt20d17072008/jt20d17072008.asx" length="" type="video/x-ms-wmv"/> - </item> - <item> - <title><![CDATA[Journal :16/07/2008]]></title> - <link><![CDATA[http://s.tf1.fr/FluxJt/jt20d16072008/jt20d16072008.asx]]></link> - <pubDate>Wed, 16 Jul 2008 00:00:00 +0200</pubDate> - <description><![CDATA[Le Journal de 20h sur TF1]]></description> - <enclosure url="http://s.tf1.fr/FluxJt/jt20d16072008/jt20d16072008.asx" length="" type="video/x-ms-wmv"/> - </item> - <item> - <title><![CDATA[Journal :15/07/2008]]></title> - <link><![CDATA[http://s.tf1.fr/FluxJt/jt20d15072008/jt20d15072008.asx]]></link> - <pubDate>Tue, 15 Jul 2008 00:00:00 +0200</pubDate> - <description><![CDATA[Le Journal de 20h sur TF1]]></description> - <enclosure url="http://s.tf1.fr/FluxJt/jt20d15072008/jt20d15072008.asx" length="" type="video/x-ms-wmv"/> - </item> - <item> - <title><![CDATA[Journal :14/07/2008]]></title> - <link><![CDATA[http://s.tf1.fr/FluxJt/jt20d14072008/jt20d14072008.asx]]></link> - <pubDate>Mon, 14 Jul 2008 00:00:00 +0200</pubDate> - <description><![CDATA[Le Journal de 20h sur TF1]]></description> - <enclosure url="http://s.tf1.fr/FluxJt/jt20d14072008/jt20d14072008.asx" length="" type="video/x-ms-wmv"/> - </item> - </channel> -</rss> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ara...@us...> - 2008-08-20 09:49:58
|
Revision: 223 http://easybox-mod.svn.sourceforge.net/easybox-mod/?rev=223&view=rev Author: aragornis Date: 2008-08-20 09:49:53 +0000 (Wed, 20 Aug 2008) Log Message: ----------- Suppression des donn?\195?\169es utilisateur Removed Paths: ------------- trunk/http/_utilisateur/Rep.txt trunk/http/_utilisateur/agenda.db trunk/http/_utilisateur/audio.db trunk/http/_utilisateur/cache.db trunk/http/_utilisateur/configuration.ini trunk/http/_utilisateur/podcast.db trunk/http/_utilisateur/records.db trunk/http/_utilisateur/rss.db trunk/http/_utilisateur/utilisateur.db trunk/http/_utilisateur/video.db Deleted: trunk/http/_utilisateur/Rep.txt =================================================================== --- trunk/http/_utilisateur/Rep.txt 2008-08-20 09:00:33 UTC (rev 222) +++ trunk/http/_utilisateur/Rep.txt 2008-08-20 09:49:53 UTC (rev 223) @@ -1,2 +0,0 @@ - - Deleted: trunk/http/_utilisateur/configuration.ini =================================================================== --- trunk/http/_utilisateur/configuration.ini 2008-08-20 09:00:33 UTC (rev 222) +++ trunk/http/_utilisateur/configuration.ini 2008-08-20 09:49:53 UTC (rev 223) @@ -1,46 +0,0 @@ - -[multimedia] -sortieordi = "none" -qualiteaudio = "Stereo" -compensation = "0" -qualite = "play.html" - -[explorateur] -films_defaut = "d:/Videos" -photos_defaut = "d:/Pictures" -audio_defaut = "d:/Music" -dvd = "d:" -ext = ".avi,.mpg,.mpeg,.mkv,.ogg,.wmv,.wma,.mp4,.3gp,.mov" -ext_photo = ".jpg,.gif,.bmp,.jpeg,.png" -ext_audio = ".mp3,.ogg,.wma,.cda,.m3u,.wav" -afficher_fichier_cache = "non" - -[scan] -nettoyer = "cd1,cd2,divx,dvdrip,_,FRENCH,VOSTFR,Vostfr" -afficher_personnes = "oui" -ext_noscan = "NOSCAN" - -[skin] -skin = "Mediacenter" - -[download] -patch = "http://www.easybox-freeplayer.com/modules/addon/" -xml = "http://www.easybox-freeplayer.com/genxml.php" -maj = "non" - -[demarrage] -demarrage = "_menu/menu.php" - -[favoris] -touche1 = "films/" -touche2 = "mp3/" -touche3 = "diaporama/" -touche4 = "guidetv/" -touche5 = "meteo/" -touche6 = "mail/" -touche7 = "jt/" -touche8 = "livescore/" -touche9 = "maj_mod/" - -[modules] -afficher_categories = "oui" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ara...@us...> - 2008-08-20 08:42:23
|
Revision: 221 http://easybox-mod.svn.sourceforge.net/easybox-mod/?rev=221&view=rev Author: aragornis Date: 2008-08-20 08:42:19 +0000 (Wed, 20 Aug 2008) Log Message: ----------- Added Paths: ----------- trunk/http/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ara...@us...> - 2008-08-20 08:41:08
|
Revision: 220 http://easybox-mod.svn.sourceforge.net/easybox-mod/?rev=220&view=rev Author: aragornis Date: 2008-08-20 08:41:03 +0000 (Wed, 20 Aug 2008) Log Message: ----------- Removed Paths: ------------- trunk/http/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ara...@us...> - 2008-08-19 22:17:24
|
Revision: 218 http://easybox-mod.svn.sourceforge.net/easybox-mod/?rev=218&view=rev Author: aragornis Date: 2008-08-19 22:17:22 +0000 (Tue, 19 Aug 2008) Log Message: ----------- Partager projet "http" dans "https://easybox-mod.svn.sourceforge.net/svnroot/easybox-mod" Added Paths: ----------- trunk/http/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ara...@us...> - 2008-08-19 22:16:06
|
Revision: 217 http://easybox-mod.svn.sourceforge.net/easybox-mod/?rev=217&view=rev Author: aragornis Date: 2008-08-19 22:16:03 +0000 (Tue, 19 Aug 2008) Log Message: ----------- Removed Paths: ------------- trunk/trunk/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ara...@us...> - 2008-08-19 22:12:44
|
Revision: 215 http://easybox-mod.svn.sourceforge.net/easybox-mod/?rev=215&view=rev Author: aragornis Date: 2008-08-19 22:12:42 +0000 (Tue, 19 Aug 2008) Log Message: ----------- Added Paths: ----------- trunk/trunk/ trunk/trunk/http/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ara...@us...> - 2008-08-19 22:08:17
|
Revision: 214 http://easybox-mod.svn.sourceforge.net/easybox-mod/?rev=214&view=rev Author: aragornis Date: 2008-08-19 22:08:13 +0000 (Tue, 19 Aug 2008) Log Message: ----------- Removed Paths: ------------- trunk/http/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ara...@us...> - 2008-08-19 22:05:42
|
Revision: 213 http://easybox-mod.svn.sourceforge.net/easybox-mod/?rev=213&view=rev Author: aragornis Date: 2008-08-19 22:05:39 +0000 (Tue, 19 Aug 2008) Log Message: ----------- Added Paths: ----------- trunk/http/trunk/ trunk/http/trunk/Easybox/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ara...@us...> - 2008-08-19 22:02:26
|
Revision: 212 http://easybox-mod.svn.sourceforge.net/easybox-mod/?rev=212&view=rev Author: aragornis Date: 2008-08-19 22:02:23 +0000 (Tue, 19 Aug 2008) Log Message: ----------- Added Paths: ----------- trunk/http/version.html Removed Paths: ------------- trunk/version.html Copied: trunk/http/version.html (from rev 211, trunk/version.html) =================================================================== --- trunk/http/version.html (rev 0) +++ trunk/http/version.html 2008-08-19 22:02:23 UTC (rev 212) @@ -0,0 +1,9 @@ + +<html> +<head> +</head> +<body> +<h1>Easybox</h1> +<h2>4.1.3</h2> +</body> +</html> \ No newline at end of file Deleted: trunk/version.html =================================================================== --- trunk/version.html 2008-08-19 22:02:00 UTC (rev 211) +++ trunk/version.html 2008-08-19 22:02:23 UTC (rev 212) @@ -1,9 +0,0 @@ - -<html> -<head> -</head> -<body> -<h1>Easybox</h1> -<h2>4.1.3</h2> -</body> -</html> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ara...@us...> - 2008-08-19 22:02:03
|
Revision: 211 http://easybox-mod.svn.sourceforge.net/easybox-mod/?rev=211&view=rev Author: aragornis Date: 2008-08-19 22:02:00 +0000 (Tue, 19 Aug 2008) Log Message: ----------- Added Paths: ----------- trunk/http/testeur.php Removed Paths: ------------- trunk/testeur.php Copied: trunk/http/testeur.php (from rev 210, trunk/testeur.php) =================================================================== --- trunk/http/testeur.php (rev 0) +++ trunk/http/testeur.php 2008-08-19 22:02:00 UTC (rev 211) @@ -0,0 +1,75 @@ +<?php +function parsePHPModules() { + ob_start(); + phpinfo(); + $s = ob_get_contents(); + ob_end_clean(); + + $s = strip_tags($s,'<h2><td>'); + //print_r($s); + $s = preg_replace('/<h2[^>]*>([^<]+)<\/h2>/',"<cat>\\1</cat>",$s); + $s = preg_replace('/<td class="e">([^<]+)<\/td>/',"<key>\\1</key>",$s); + $s = preg_replace('/<td class="v">([^<]+)<\/td>/',"<val>\\1</val>",$s); + $s="<cat>principal</cat>".$s; + $s = strip_tags($s,'<cat><key><val>'); + $vcat = preg_split('/(<cat>[^<]+<\/cat>)/',$s,-1,PREG_SPLIT_DELIM_CAPTURE); + $vcat=array_filter($vcat); + $vcat=array_values($vcat); + $vModules = array(); + $i=0; + while ($i<count($vcat)) { + if (preg_match('/<cat>([^<]+)<\/cat>/',$vcat[$i],$vMat)) { + $catName = trim($vMat[1]); + $vkey = preg_split('/(<key>[^<]+<\/key>)/',$vcat[++$i],-1,PREG_SPLIT_DELIM_CAPTURE); + $j=0; + while ($j<count($vkey)) { + if (preg_match('/<key>([^<]+)<\/key>/',$vkey[$j],$vMat)) { + $keyName=trim($vMat[1]); + if (preg_match('/<val>([^<]+)<\/val>/',$vkey[++$j],$vMat)) +$vModules[$catName][$keyName]=trim($vMat[1]); + } + $j++; + } + $i++; + } + } + return $vModules; +} + +function getSetting($pModuleName,$pSetting, $text_ok, $text_nok) { + $vModules = parsePHPModules(); + if (!$vModules[$pModuleName][$pSetting]) { + echo "<b><font color=red>".$text_nok."</font></b><br>"; + }else{ + echo "<b>".$text_ok.$vModules[$pModuleName][$pSetting]."</b><br>"; + } +} + + +getSetting('Apache Environment','DOCUMENT_ROOT', 'R\xE9pertoire par defaut :', 'R\xE9pertoire DOC_ROOT non configurer'); +getSetting('principal','System', 'Systeme d\'exploitation :', 'Syst\xE9me d\'exploitation non d\xE9termin\xE9'); + + +echo "<hr>"; +getSetting('gd','GD Version', 'Le module GD est pr\xE9sent avec la version : ', 'Le module GD n\'est pas pr\xE9sent !'); +getSetting('SimpleXML','Revision', 'Le module SimpleXML est pr\xE9sent avec la version : ', 'Le module SimpleXML n\'est pas pr\xE9sent !'); +getSetting('SQLite','SQLite Library', 'Le module SQLite est pr\xE9sent avec la version : ', 'Le module SQLite n\'est pas pr\xE9sent !'); +getSetting('zlib','Compiled Version', 'Le module Zlib est pr\xE9sent avec la version : ', 'Le module Zlib n\'est pas pr\xE9sent !'); +getSetting('imap','IMAP c-Client Version', 'Le module imap pr\xE9sent avec la version : ', 'Le module imap n\'est pas pr\xE9sent !'); +getSetting('libxml','libXML Version', 'Le module libXML pr\xE9sent avec la version : ', 'Le module libXML n\'est pas pr\xE9sent !'); +getSetting('xml','EXPAT Version', 'Le module XML pr\xE9sent avec la version : ', 'Le module XML n\'est pas pr\xE9sent !'); +echo "<hr>"; +getSetting('Apache Environment','SERVER_SOFTWARE', 'Version du Serveur : ', 'Aucune donn\xE9es sur la version du SERVEUR !'); +echo "<hr>"; + + if(!$contenu_html = file_get_contents("http://127.0.0.1:8081/_framework/vlc/temps2.html")){ + echo '<b>Vlc n\'est pas lanc\xE9 ou il n\'\xE9coute pas le port 8081</b>'; + }else{ + echo '<b>Vlc est bien lanc\xE9 et il \xE9coute le port 8081</b>'; + } + + + +//phpinfo(); + +?> Deleted: trunk/testeur.php =================================================================== --- trunk/testeur.php 2008-08-19 22:01:37 UTC (rev 210) +++ trunk/testeur.php 2008-08-19 22:02:00 UTC (rev 211) @@ -1,75 +0,0 @@ -<?php -function parsePHPModules() { - ob_start(); - phpinfo(); - $s = ob_get_contents(); - ob_end_clean(); - - $s = strip_tags($s,'<h2><td>'); - //print_r($s); - $s = preg_replace('/<h2[^>]*>([^<]+)<\/h2>/',"<cat>\\1</cat>",$s); - $s = preg_replace('/<td class="e">([^<]+)<\/td>/',"<key>\\1</key>",$s); - $s = preg_replace('/<td class="v">([^<]+)<\/td>/',"<val>\\1</val>",$s); - $s="<cat>principal</cat>".$s; - $s = strip_tags($s,'<cat><key><val>'); - $vcat = preg_split('/(<cat>[^<]+<\/cat>)/',$s,-1,PREG_SPLIT_DELIM_CAPTURE); - $vcat=array_filter($vcat); - $vcat=array_values($vcat); - $vModules = array(); - $i=0; - while ($i<count($vcat)) { - if (preg_match('/<cat>([^<]+)<\/cat>/',$vcat[$i],$vMat)) { - $catName = trim($vMat[1]); - $vkey = preg_split('/(<key>[^<]+<\/key>)/',$vcat[++$i],-1,PREG_SPLIT_DELIM_CAPTURE); - $j=0; - while ($j<count($vkey)) { - if (preg_match('/<key>([^<]+)<\/key>/',$vkey[$j],$vMat)) { - $keyName=trim($vMat[1]); - if (preg_match('/<val>([^<]+)<\/val>/',$vkey[++$j],$vMat)) -$vModules[$catName][$keyName]=trim($vMat[1]); - } - $j++; - } - $i++; - } - } - return $vModules; -} - -function getSetting($pModuleName,$pSetting, $text_ok, $text_nok) { - $vModules = parsePHPModules(); - if (!$vModules[$pModuleName][$pSetting]) { - echo "<b><font color=red>".$text_nok."</font></b><br>"; - }else{ - echo "<b>".$text_ok.$vModules[$pModuleName][$pSetting]."</b><br>"; - } -} - - -getSetting('Apache Environment','DOCUMENT_ROOT', 'R\xE9pertoire par defaut :', 'R\xE9pertoire DOC_ROOT non configurer'); -getSetting('principal','System', 'Systeme d\'exploitation :', 'Syst\xE9me d\'exploitation non d\xE9termin\xE9'); - - -echo "<hr>"; -getSetting('gd','GD Version', 'Le module GD est pr\xE9sent avec la version : ', 'Le module GD n\'est pas pr\xE9sent !'); -getSetting('SimpleXML','Revision', 'Le module SimpleXML est pr\xE9sent avec la version : ', 'Le module SimpleXML n\'est pas pr\xE9sent !'); -getSetting('SQLite','SQLite Library', 'Le module SQLite est pr\xE9sent avec la version : ', 'Le module SQLite n\'est pas pr\xE9sent !'); -getSetting('zlib','Compiled Version', 'Le module Zlib est pr\xE9sent avec la version : ', 'Le module Zlib n\'est pas pr\xE9sent !'); -getSetting('imap','IMAP c-Client Version', 'Le module imap pr\xE9sent avec la version : ', 'Le module imap n\'est pas pr\xE9sent !'); -getSetting('libxml','libXML Version', 'Le module libXML pr\xE9sent avec la version : ', 'Le module libXML n\'est pas pr\xE9sent !'); -getSetting('xml','EXPAT Version', 'Le module XML pr\xE9sent avec la version : ', 'Le module XML n\'est pas pr\xE9sent !'); -echo "<hr>"; -getSetting('Apache Environment','SERVER_SOFTWARE', 'Version du Serveur : ', 'Aucune donn\xE9es sur la version du SERVEUR !'); -echo "<hr>"; - - if(!$contenu_html = file_get_contents("http://127.0.0.1:8081/_framework/vlc/temps2.html")){ - echo '<b>Vlc n\'est pas lanc\xE9 ou il n\'\xE9coute pas le port 8081</b>'; - }else{ - echo '<b>Vlc est bien lanc\xE9 et il \xE9coute le port 8081</b>'; - } - - - -//phpinfo(); - -?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |