From: Ben Schmidt <none@none>
Date: Sun, 17 Oct 2010 22:59:24 +0000 (+1100)
Subject: Fix php-admin to work when topdir contains a symlink (e.g. on Mac)
X-Git-Tag: RELEASE_1_2_18a1~95
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bcb1a3b993fefd350744224a512db101511c3629;p=thirdparty%2Fmlmmj.git

Fix php-admin to work when topdir contains a symlink (e.g. on Mac)
---

diff --git a/ChangeLog b/ChangeLog
index 6edfbfbe..1ca49219 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+ o Fix php-admin to work when topdir contains a symlink (e.g. on Mac)
  o Better techniques for locating support files in php-admin -- existing
    installations will need to have their conf/config.php altered to set
    the variable $confdir
diff --git a/contrib/web/php-admin/htdocs/edit.php b/contrib/web/php-admin/htdocs/edit.php
index c9faf53b..a0d7908e 100644
--- a/contrib/web/php-admin/htdocs/edit.php
+++ b/contrib/web/php-admin/htdocs/edit.php
@@ -104,7 +104,7 @@ $list = $HTTP_GET_VARS["list"];
 if(!isset($list))
 die("no list specified");
 
-if (dirname(realpath($topdir."/".$list)) != $topdir)
+if (dirname(realpath($topdir."/".$list)) != realpath($topdir))
 die("list outside topdir");
 
 if(!is_dir($topdir."/".$list))
diff --git a/contrib/web/php-admin/htdocs/save.php b/contrib/web/php-admin/htdocs/save.php
index fcc6466d..75ae32a7 100644
--- a/contrib/web/php-admin/htdocs/save.php
+++ b/contrib/web/php-admin/htdocs/save.php
@@ -84,7 +84,7 @@ $list = $HTTP_POST_VARS["list"];
 if(!isset($list))
 die("no list specified");
 
-if (dirname(realpath($topdir."/".$list)) != $topdir)
+if (dirname(realpath($topdir."/".$list)) != realpath($topdir))
 die("list outside topdir");
 
 if(!is_dir($topdir."/".$list))