[Easybox-mod-developeurs] SF.net SVN: easybox-mod: [177] trunk/module

[<ara...@us...>]

Revision: 177
          http://svn.sourceforge.net/easybox-mod/?rev=177&view=rev
Author:   aragornis
Date:     2007-06-02 14:05:12 -0700 (Sat, 02 Jun 2007)

Log Message:
-----------
- t?\195?\169l?\195?\169sites presque compl?\195?\169tement fonctionnels
- r?\195?\169paration d'un pti bug sur la gestion multipage du catalogue audio

Modified Paths:
--------------
    trunk/module/mp3/catalogue.php
    trunk/module/telesites/index1.php

Modified: trunk/module/mp3/catalogue.php
===================================================================
--- trunk/module/mp3/catalogue.php	2007-06-02 13:10:16 UTC (rev 176)
+++ trunk/module/mp3/catalogue.php	2007-06-02 21:05:12 UTC (rev 177)
@@ -116,7 +116,7 @@
   $smarty->assign('rows',$RESULT);
 
 	sqlite_close($db);
-  start_multi('lecteuraudio.php?mode=bib&t='.$type.'&l='.$l.'&wf='.$wherefield.'&wl='.$wherelike,10,$rows);
+  start_multi('lecteuraudio.php?mode=bib&t='.$type.'&l='.$letter.'&wf='.$wherefield.'&wl='.$wherelike,10,$rows);
 $smarty->assign('CONTENT',$smarty->fetch('catalogue_audio.tpl'));
 }
 

Modified: trunk/module/telesites/index1.php
===================================================================
--- trunk/module/telesites/index1.php	2007-06-02 13:10:16 UTC (rev 176)
+++ trunk/module/telesites/index1.php	2007-06-02 21:05:12 UTC (rev 177)
@@ -32,12 +32,21 @@
   $base = $sites[$_GET['siteid']]['url'];
 }
 
-$contenu = file_get_contents($base);
+$contenu = stripslashes(file_get_contents($base));
 $info_url = ParseURLplus($base);
 
-
-$contenu = preg_replace('/href="(.{1,300})"/se', "'href=\"index1.php?siteid={$_GET['siteid']}&url='.urlencode('http://{$info_url['host']}').stripslashes('$1').'\"';", $contenu);
-$contenu = preg_replace('/src="(.{1,300})"/se', "'src=\"{$IMG2FBX}?cache=1&img='.urlencode('http://{$info_url['host']}').'$1'.'\"';", $contenu);
+function formaterurl($url){
+global $info_url;
+  if(eregi('http://',$url)){
+    return false;
+  }elseif(substr($url,0,1)=='/'){
+    return urlencode('http://'.$info_url['host']);
+  }else{
+    return urlencode('http://'.$info_url['host'].$info_url['dir'].'/');
+  }
+}
+$contenu = preg_replace('/href="(.{1,100})">/se', "'href=\"index1.php?siteid={$_GET['siteid']}&url='.formaterurl('$1').str_replace('\\\\\\\\','','$1').'\">';", $contenu);
+$contenu = preg_replace('/src="(.{1,300})(" \/>|">|"\/>)/se', "'src=\"{$IMG2FBX}?cache=1&img='.formaterurl('$1').str_replace('\\\\\\\\','','$1').'\">';", $contenu);
 $contenu = str_replace('</body>', '<script language="javascript" src="/fb2ie.js"></script></body>', $contenu);
 
 $ereg = '<source>(.{1,800})<\/source>';
@@ -50,14 +59,17 @@
 
 $xml = simplexml_load_string($commandes);
 $xml2 = simplexml_load_string($commandes2);
+
+if($res2 = @$xml2->xpath('/backgroundContent/settings')){
+$forcerimage = $res2[0]['stopCurrentlyPlaying'];
+}
 if($res = @$xml->xpath('/url')){
   play_fichier('type=20&temps=8000',$res[0],0,'photo'); 
 }
-$res2 = $xml2->xpath('/backgroundContent/settings');
-$forcerimage = $res2[0]['stopCurrentlyPlaying'];
 
 
 
+
 echo $contenu;
 
 }else{


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.