[dev] [commits] Horde branch master updated. 7b56cd8b6078f3ebae95ff272e24694c48ceb37c

[Michael M Slusarz]

Quoting Jan Schneider <jan at horde.org>:

> Zitat von Michael M Slusarz <slusarz at horde.org>:
>
>> commit 96c8725bfe9d6746252dd74adabf0ad9753b469d
>> Author: Michael M Slusarz <slusarz at curecanti.org>
>> Date:   Fri Feb 11 10:45:47 2011 -0700
>>
>>    Revert "Actually use $app_webroot/fileroot for the Horde stanza."
>>
>>    This reverts commit 86be1eafeff8848940928febf5a93ea2d2f7b071.
>>
>>    This is incorrect usage of $app_webroot.  It is *NOT* the location of
>>    the base of horde.  It is the directory that contains the horde apps
>>    (e.g. the base git directory).
>>
>>    HORDE_BASE already contains the correct horde webroot.  No need to
>>    calculate again.
>>
>> framework/Core/lib/Horde/Registry.php |    8 ++------
>> 1 files changed, 2 insertions(+), 6 deletions(-)
>>
>> http://git.horde.org/horde-git/-/commit/96c8725bfe9d6746252dd74adabf0ad9753b469d
>
> You are mixing things here. $app_webroot has nothing to do with  
> directories, it't the URL's root, and without that, _detectWebroot()  
> is used for horde's 'webroot' setting, which is wrong.
> The same is true for $app_fileroot though. Try a fresh git install  
> with a pristine registry.php. It won't load.

Yes - you are correct.  I was getting confused.  Re-reverted.

>> commit 7b56cd8b6078f3ebae95ff272e24694c48ceb37c
>> Author: Michael M Slusarz <slusarz at curecanti.org>
>> Date:   Fri Feb 11 10:49:19 2011 -0700
>>
>>    Revert "No idea what happened to getLoginParams(), but it  
>> doesn't exist anymore."
>>
>>    This reverts commit cf2d5a60366246e3a91c2a7847568651b51a27f6.
>>
>>    getLoginParams() exists (Horde_Core_Auth_Application), and this commit
>>    breaks things like logging into IMP for me.
>>
>> horde/login.php |    4 ----
>> 1 files changed, 0 insertions(+), 4 deletions(-)
>>
>> http://git.horde.org/horde-git/-/commit/7b56cd8b6078f3ebae95ff272e24694c48ceb37c
>
> But that's the only driver the has this method. And it's passing it  
> through the $_base driver, but no other driver has this methods. I  
> don't even get to the login screen at the moment, because i get a  
> fatal error of this missing method. I can log in to IMP just fine.

You are correct - I took out the loginparams capability check and  
neglected to re-add a check to see if getLoginParams() existed in the  
base auth driver.  This has also been fixed.

michael

-- 
___________________________________
Michael Slusarz [slusarz at horde.org]