|
From: Joseph T. <jt...@us...> - 2004-04-11 03:53:06
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16937 Modified Files: Tag: branch-0-6 serendipity_admin_installer.inc.php Log Message: Fixed a bug in the installer if the blog is not in a subdir of apache's Document root. Garvin, if there's a reason that you canged this, speak up. Index: serendipity_admin_installer.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_installer.inc.php,v retrieving revision 1.59 retrieving revision 1.59.2.1 diff -u -d -r1.59 -r1.59.2.1 --- serendipity_admin_installer.inc.php 21 Mar 2004 16:35:31 -0000 1.59 +++ serendipity_admin_installer.inc.php 11 Apr 2004 03:39:31 -0000 1.59.2.1 @@ -11,7 +11,8 @@ function serendipity_query_default($optname, $default) { switch ($optname) { case 'serendipityPath': - return $_SERVER['DOCUMENT_ROOT'] . rtrim(dirname($_SERVER['PHP_SELF']), '/') . '/'; + #This doesn't work if the blog isn't in the DOCUMENT_ROOT: return $_SERVER['DOCUMENT_ROOT'] . rtrim(dirname($_SERVER['PHP_SELF']), '/') . '/'; + return dirname(__FILE__) . '/'; case 'serendipityHTTPPath': return rtrim(dirname($_SERVER['PHP_SELF']), '/') .'/'; |
|
From: Garvin H. <squ...@su...> - 2004-04-11 15:31:28
|
Hi Joseph! > Fixed a bug in the installer if the blog is not in a subdir of apache's Document > root. Garvin, if there's a reason that you canged this, speak up. Yes, there is a reason: When using the shared library setup, the _FILE_ variable points to the /usr/local/lib/php/s9y path instead of the directory where you are running s9y from. So your patch breaks the shared setup. I wonder in which case s9y is not installed in a document_root, does this even exist? I think the patch breaks more than it does good, so I vote for either restoring the old way for our 0.6 release or think of how we can get both ways to work. I'm currently very busy with other stuff, so maybe one can come up with a solution? Regards, Garvin. |
|
From: Joseph T. <jt...@dr...> - 2004-04-11 17:24:31
|
I think that this is frequenly the case: If you want to install it under a user directory (My test setup is at http://www.dragonstrider.com/~jtate/serendipity for example). If your web hosting company provided you space at http://www.example.com/foo/bar, but used Directory directives in httpd.conf rather than a virtual server it would fail for you. The return value I replaced showed /var/www/html/home/jtate/public_html/serendipty as the local dir. Isn't /usr/local/lib/php/s9y the desired path for serendipityPath if that's where serendipity_config* and the like are located? Several places in the code we include $serendipity['serendipityPath'] . "foo.php". I guess I don't see what the problem is: Why is returning /usr/local/lib/php/s9y a bad thing? Any ideas? I suppose we could try some variation on $_SERVER['PATH_TRANSLATED']. I'll be happy to come up with a test script with a bunch of possible solutions that we could all run to see which gives the correct response. Joseph Garvin Hicking wrote: > Hi Joseph! > > >>Fixed a bug in the installer if the blog is not in a subdir of apache's Document >>root. Garvin, if there's a reason that you canged this, speak up. > > > Yes, there is a reason: > > When using the shared library setup, the _FILE_ variable points to the > /usr/local/lib/php/s9y path instead of the directory where you are running s9y > from. So your patch breaks the shared setup. > > I wonder in which case s9y is not installed in a document_root, does this even > exist? I think the patch breaks more than it does good, so I vote for either > restoring the old way for our 0.6 release or think of how we can get both ways > to work. > > I'm currently very busy with other stuff, so maybe one can come up with a solution? > > Regards, > Garvin. > |
|
From: Garvin H. <squ...@su...> - 2004-04-11 18:12:50
|
Hi Joseph! > I think that this is frequenly the case: If you want to install it under > a user directory (My test setup is at > http://www.dragonstrider.com/~jtate/serendipity for example). If your > web hosting company provided you space at > http://www.example.com/foo/bar, but used Directory directives in > httpd.conf rather than a virtual server it would fail for you. The > return value I replaced showed > /var/www/html/home/jtate/public_html/serendipty as the local dir. True, I forgot about that way of assigning directorys to hostnames. Damn. :) > Isn't /usr/local/lib/php/s9y the desired path for serendipityPath if > that's where serendipity_config* and the like are located? Several > places in the code we include $serendipity['serendipityPath'] . > "foo.php". I guess I don't see what the problem is: Why is returning > /usr/local/lib/php/s9y a bad thing? But we use the Path setting also many times on including the templates/plugins or the local configuration -- those always need to be read from the "real" directory, not the shared one. The easiest way would be to create two directory paths serendipityPath and serendipityLibraryPath... > Any ideas? I suppose we could try some variation on > $_SERVER['PATH_TRANSLATED']. Hm, I haven't yet tested if that variable is set on those occasions... > I'll be happy to come up with a test script with a bunch of possible > solutions that we could all run to see which gives the correct response. That would be great! Thanks and regards, Garvin. |
|
From: Garvin H. <squ...@su...> - 2004-04-12 14:52:53
|
Hi All!
> Modified Files:
> Tag: branch-0-6
I guess we're having synch problems because of having branch_0_6 and branch-0-6.
The last one was making problems for me on the release day (don't remember
which, but I couldn't check that branch out) so I created the branch_0_6 and
modified files there.
Joseph seems to have modified files in the other branch. I don't know how to
remove a branch nor how to easily synch those two branches and stick to
branch-0-6 instead. Does anyone have some spare time to correct those issues and
merge the changes in one singular branch?
There are a couple of other outstanding bugs both on the mailinglist and on the
forums, I will try to take care of them tomorrow if I find some time. At least I
can confirm Sebastian's cateogires bug with 0.6.1.
Joseph, I though of this solution on the installer:
> switch ($optname) {
> case 'serendipityPath':
> - return $_SERVER['DOCUMENT_ROOT'] .
> rtrim(dirname($_SERVER['PHP_SELF']), '/') . '/';
> + #This doesn't work if the blog isn't in the DOCUMENT_ROOT: return
> $_SERVER['DOCUMENT_ROOT'] . rtrim(dirname($_SERVER['PHP_SELF']), '/') . '/';
> + return dirname(__FILE__) . '/';
We could make it like this:
switch ($optname) {
case 'serendipityPath':
$path1 = $_SERVER['DOCUMENT_ROOT'] .
rtrim(dirname($_SERVER['PHP_SELF']), '/') . '/';
$path2 = dirname(__FILE__);
if (file_exists($path1 . 'serendipity_entries.php')) {
return $path1;
} else {
return $path2;
}
So we check first if files exist in the preferred "real" directory (not the
possible shared libary path) and only if that doesn't exist, we return the real
path of our filename. So we could save one additional variable, and if the
variable fails for both cases, you can always edit it in the installer...?
Regards,
Garvin.
|
