hello, I am using this patch to show the loginform instad of the default text on some of the wikis in my farm. It has a new conf setting and I decided to add a new function in inc/html because it was the only case without one and would have been the only case with $conf :) greets, sf
New patches: [ondeniedlogin sf@xxxxxxxxxxxxx**20090315024351 add a config var to allow showing the loginform instead of the default text for denied requests ] { hunk ./conf/dokuwiki.php 79 +$conf['ondeniedlogin'] = 1; //Show login form on denied areas if user is not logged in + hunk ./inc/html.php 42 +/** + * print info for denied requests + * + * @author Samuel Fischer <sf@xxxxxxxxxxxxx> + */ +function html_denied(){ + global $INFO; + global $conf; + if($conf['ondeniedlogin'] && !is_array($INFO['userinfo'])) + html_login(); + else + print p_locale_xhtml('denied'); +} + hunk ./inc/lang/en/denied.txt 3 -Sorry, you don't have enough rights to continue. Perhaps you forgot to login? +Sorry, you don't have enough rights to continue. hunk ./inc/template.php 121 - print p_locale_xhtml('denied'); + html_denied(); hunk ./lib/plugins/config/lang/en/lang.php 110 +$lang['ondeniedlogin'] = 'On denied requests, show login form instead of the default text if user is not logged in'; hunk ./lib/plugins/config/settings/config.metadata.php 135 +$meta['ondeniedlogin'] = array('onoff'); } Context: [Support for multirange requests for media FS#1630 Andreas Gohr <andi@xxxxxxxxxxxxxx>**20090313190247 Ignore-this: 50de569608231b910a62327d2f3af1de This patch moves all HTTP sending related functions to inc/httputils.php Handling of range requests was rewritten completely to support mutirange requests. This should fix problems with Adobe Reader but needs testing. ] [fix display of pages in youarehere navigation FS#1611 Andreas Gohr <andi@xxxxxxxxxxxxxx>**20090312230306 Ignore-this: 27fbdff6135deed64843aadfe83f5f7 ] [Search function update daniel.lindgren@xxxxxxxxxxxxx**20090311160255 Ignore-this: 4cd6bddacb795ef15f133559c223ac1f * Adds the possibility to exclude namespace(s) from search, by preceding them with "^". * Changed handling of search parameters to allow any order of words and namespaces. ] [Action Event wrappers around HTTP requests and authentication checks Robin Gareus <robin@xxxxxxxxxx>**20090312224454 Ignore-this: 9ffd0327c318a633e33a60e0a8ecf7f5 ] [bugfix for IXR_Date::parseIso() Mikhail I. Izmestev <izmmishao5@xxxxxxxxx>**20090312223053 Ignore-this: e8d6e4b7eade8bd2898ada53cd9cf0dd ] [configmgr: visual improvements (warning icons for newbies and links to each documentation page) Anika Henke <anika@xxxxxxxxxxxxxxx>**20090312222853] [fixed cookie handling in HTTPClient Andreas Gohr <andi@xxxxxxxxxxxxxx>**20090312201700 Ignore-this: bcdedaf795a2eb5fe89b2be4ca7b6dc1 ] [Ukrainian language update Oleksandr Kunytsia <okunia@xxxxxxxxx>**20090311160516 Ignore-this: e0973989e5ba1c5e3b8defeb66bc3c2a ] [provide emphasis-with-external-url test case with correct result data Chris Smith <chris.eureka@xxxxxxxxxxxxx>**20090308163855] [fixed skipacl option in search_allpages() Andreas Gohr <andi@xxxxxxxxxxxxxx>**20090308171416] [check if $auth is set in editorinfo() FS#1636 Andreas Gohr <andi@xxxxxxxxxxxxxx>**20090306185717] [additional emphasis test cases, plus add includes for init.php and confutils.php into parser test setup Chris Smith <chris.eureka@xxxxxxxxxxxxx>**20090308161937] [removed debug statements Andreas Gohr <andi@xxxxxxxxxxxxxx>**20090308112249 Ignore-this: c7d706a81320fb2bf80a399e5fcc259a ] [fix incorrectly spelled "feof()" + some comment spelling/grammar Chris Smith <chris.eureka@xxxxxxxxxxxxx>**20090308062316] [add test case for FS#1609 patch (hex numbers shouldn't match multiply entity) Chris Smith <chris.eureka@xxxxxxxxxxxxx>**20090308041259] [Support login in XMLRCP and added API version info Andreas Gohr <andi@xxxxxxxxxxxxxx>**20090303193608 A simple version number was added to the XMLRPC API to make it easy for clients to check if the remote endpoint supports certain features. The login function will take credentials and set cookies on successful login. This is useful when HTTP Basic auth is not available. ] [Check HTTP response code in XMLRPC client Andreas Gohr <andi@xxxxxxxxxxxxxx>**20090303193527] [removed leftover return path Andreas Gohr <andi@xxxxxxxxxxxxxx>**20090302175515] [Replaced date-functions by their utc-quivalent in the XML-RPC library. michael@xxxxxxxxxxxxxxxx**20090227223344 Ignore-this: e74f051d409c2df9e59f6f0b42f362f8 According to the specification of the wiki XML-RPC api at http://www.jspwiki.org/wiki/WikiRPCInterface2 all returned datetimes should be UTC. This commit changes the date-functions in IXR_Date to make DokuWiki obey to this specification (otherwise there is now way to get from these datetimes back to a timestamp for example). ] [Fixed media size in getRecentMediaChanges XML-RPC call. michael@xxxxxxxxxxxxxxxx**20090227220304 Ignore-this: 6477d59a1da2f51295326537fa8e14bf ] [fixed media listing for recent change in search_media Andreas Gohr <andi@xxxxxxxxxxxxxx>**20090301192547] [fixed depth checking in search_(media|allpages) Andreas Gohr <andi@xxxxxxxxxxxxxx>**20090301192434] [streamlined media listing Andreas Gohr <andi@xxxxxxxxxxxxxx>**20090223172746 Some parameters of media_search where changed, parts using this function need to be identified and fixed. ] [TAG develsnap 2009-03-01 Andreas Gohr <andi@xxxxxxxxxxxxxx>**20090301000001] Patch bundle hash: 4e53294b93a81de9eef807c84acdaa7dfdbdf0b2