Update of /cvsroot/phpwiki/phpwiki/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13145/lib
Modified Files:
main.php
Log Message:
Improved login header for !ALLOW_ANON_USER
Index: main.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/main.php,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -2 -b -p -d -r1.229 -r1.230
--- main.php 7 Jan 2007 18:44:30 -0000 1.229
+++ main.php 27 Jan 2007 21:52:15 -0000 1.230
@@ -476,12 +476,15 @@ class WikiRequest extends Request {
elseif ($require_level == WIKIAUTH_BOGO)
$msg = fmt("You must sign in to %s.", $what);
- elseif ($require_level == WIKIAUTH_USER)
+ elseif ($require_level == WIKIAUTH_USER) {
$msg = fmt("You must log in to %s.", $what);
- elseif ($require_level == WIKIAUTH_ANON)
+ if (!ALLOW_ANON_USER)
+ $msg = fmt("You must log in first", $what);
+ } elseif ($require_level == WIKIAUTH_ANON)
$msg = fmt("Access for you is forbidden to %s.", $what);
else
$msg = fmt("You must be an administrator to %s.", $what);
- $this->_user->PrintLoginForm($this, compact('require_level','pass_required'), $msg);
+ $this->_user->PrintLoginForm($this, compact('require_level','pass_required'),
+ $msg);
$this->finish(); // NORETURN
}
@@ -1298,4 +1301,7 @@ if (!defined('PHPWIKI_NOMAIN') or !PHPWI
// $Log$
+// Revision 1.230 2007/01/27 21:52:15 rurban
+// Improved login header for !ALLOW_ANON_USER
+//
// Revision 1.229 2007/01/07 18:44:30 rurban
// Fix typo for moderation
|
