[Phpfreechat-svn] SF.net SVN: phpfreechat: [744] trunk

[<ke...@us...>]

Revision: 744
          http://svn.sourceforge.net/phpfreechat/?rev=744&view=rev
Author:   kerphi
Date:     2006-09-10 09:10:16 -0700 (Sun, 10 Sep 2006)

Log Message:
-----------
[en] Bug fix: the proxy allowed path check was broken. [fr] Bug fix: les chemins a authoriser dans le proxy ?\195?\169taient mal calcul?\195?\169s.

Modified Paths:
--------------
    trunk/misc/sendSource
    trunk/src/client/proxy.php.tpl
    trunk/src/pfcglobalconfig.class.php
    trunk/src/phpfreechat.class.php

Modified: trunk/misc/sendSource
===================================================================
--- trunk/misc/sendSource	2006-09-08 21:46:42 UTC (rev 743)
+++ trunk/misc/sendSource	2006-09-10 16:10:16 UTC (rev 744)
@@ -5,7 +5,8 @@
 PFCSETUP_TGZ=pfcsetup-`cat ../version`.tar.gz
 PFCSETUP_ZIP=pfcsetup-`cat ../version`.zip
 
+scp ./$NAME_ZIP ./$NAME_TGZ mic...@ph...:/home/micropolia/svn/phpfreechat/prod/www/download/
 lftp -c "mput -O ftp://upload.sourceforge.net/incoming/ $NAME_TGZ"
 lftp -c "mput -O ftp://upload.sourceforge.net/incoming/ $NAME_ZIP"
-lftp -c "mput -O ftp://upload.sourceforge.net/incoming/ $PFCSETUP_TGZ"
-lftp -c "mput -O ftp://upload.sourceforge.net/incoming/ $PFCSETUP_ZIP"
+#lftp -c "mput -O ftp://upload.sourceforge.net/incoming/ $PFCSETUP_TGZ"
+#lftp -c "mput -O ftp://upload.sourceforge.net/incoming/ $PFCSETUP_ZIP"

Modified: trunk/src/client/proxy.php.tpl
===================================================================
--- trunk/src/client/proxy.php.tpl	2006-09-08 21:46:42 UTC (rev 743)
+++ trunk/src/client/proxy.php.tpl	2006-09-10 16:10:16 UTC (rev 744)
@@ -10,18 +10,11 @@
 $page = isset($_GET["p"]) ? $_GET["p"] : "";
 if ($page == "") die();
 $files = array();
-if (strpos($page, "/") > 0 )
+foreach($allowedpath as $ap)
 {
-  foreach($allowedpath as $ap)
-  {
-    $f = realpath($ap."/".$page);
-    if ($f !== FALSE) $files[] = $f;
-  }
+  $f = realpath($ap."/".$page);
+  if ($f !== FALSE) $files[] = $f;
 }
-else
-{
-  $files = array(realpath($page));
-}
 $found = "";
 for( $i = 0; $i < count($allowedpath) && $found == ""; $i++)
 {

Modified: trunk/src/pfcglobalconfig.class.php
===================================================================
--- trunk/src/pfcglobalconfig.class.php	2006-09-08 21:46:42 UTC (rev 743)
+++ trunk/src/pfcglobalconfig.class.php	2006-09-10 16:10:16 UTC (rev 744)
@@ -410,9 +410,7 @@
       $allowedpath_string  = "";
       $allowedpath_string .= "\$allowedpath[] = '".realpath(dirname(__FILE__)."/../lib")."';\n";
       $allowedpath_string .= "\$allowedpath[] = '".realpath(dirname(__FILE__)."/../src/client")."';\n";
-      $allowedpath_string .= "\$allowedpath[] = '".realpath($this->themepath_default)."/..';\n";
       $allowedpath_string .= "\$allowedpath[] = '".realpath($this->themepath_default)."';\n";
-      $allowedpath_string .= "\$allowedpath[] = '".realpath($this->themepath)."/..';\n";
       $allowedpath_string .= "\$allowedpath[] = '".realpath($this->themepath)."';\n";
       $proxycontent = file_get_contents(dirname(__FILE__)."/client/proxy.php.tpl");
       $proxycontent = str_replace("//%allowedpath%", $allowedpath_string, $proxycontent);

Modified: trunk/src/phpfreechat.class.php
===================================================================
--- trunk/src/phpfreechat.class.php	2006-09-08 21:46:42 UTC (rev 743)
+++ trunk/src/phpfreechat.class.php	2006-09-10 16:10:16 UTC (rev 744)
@@ -101,17 +101,17 @@
     
     // include javascript libraries
     $js = array();
-    $js[] = "lib/xajax_0.2.3/xajax_js/xajax.js";
-    $js[] = "lib/javascript/md5.js";
-    $js[] = "lib/javascript/cookie.js";
-    $js[] = "lib/javascript/image_preloader.js";
-    $js[] = "lib/javascript/myprototype.js";
-    $js[] = "lib/javascript/regex.js";
-    $js[] = "lib/javascript/utf8.js";
-    $js[] = "lib/javascript/sprintf2.js";
-    $js[] = "src/client/pfcclient.js";
-    $js[] = "src/client/pfcgui.js";
-    $js[] = "src/client/pfcresource.js";
+    $js[] = "xajax_0.2.3/xajax_js/xajax.js";
+    $js[] = "javascript/md5.js";
+    $js[] = "javascript/cookie.js";
+    $js[] = "javascript/image_preloader.js";
+    $js[] = "javascript/myprototype.js";
+    $js[] = "javascript/regex.js";
+    $js[] = "javascript/utf8.js";
+    $js[] = "javascript/sprintf2.js";
+    $js[] = "pfcclient.js";
+    $js[] = "pfcgui.js";
+    $js[] = "pfcresource.js";
     foreach( $js as $j )
     {
       $output .= "<script type=\"text/javascript\" src=\"".$c->data_public_url."/".$c->getId()."/proxy.php?p=".$j."\"></script>\n";


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