[geeklog-cvs] geeklog: On a login failure, the user registration form showed u...

[geeklog-cvs at lists.geeklog.net]

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/b09db899c7dc
changeset: 6858:b09db899c7dc
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Mar 28 10:31:38 2009 +0100
description:
On a login failure, the user registration form showed up even when new user registration was disabled (bug #0000843)

diffstat:

2 files changed, 11 insertions(+), 10 deletions(-)
public_html/docs/history |    2 ++
public_html/users.php    |   19 +++++++++----------

diffs (49 lines):

diff -r cd2ea91b48a1 -r b09db899c7dc public_html/docs/history
--- a/public_html/docs/history	Sat Mar 28 10:22:08 2009 +0100
+++ b/public_html/docs/history	Sat Mar 28 10:31:38 2009 +0100
@@ -11,6 +11,8 @@
 + (TBD) Comment moderation and editable comments, by Jared Wenerd
 
 Other changes:
+- On a login failure, the user registration form showed up even when new user
+  registration was disabled (bug #0000843)
 - The Wiki-style format broke national special characters, e.g. Japanese and
   German umlauts (bug #0000823) [Dirk]
 - Introduced new plugin API function PLG_migrate [Dirk]
diff -r cd2ea91b48a1 -r b09db899c7dc public_html/users.php
--- a/public_html/users.php	Sat Mar 28 10:22:08 2009 +0100
+++ b/public_html/users.php	Sat Mar 28 10:31:38 2009 +0100
@@ -775,24 +775,23 @@
 * @return   string  HTML for form
 *
 */
-function defaultform ($msg)
+function defaultform($msg)
 {
-    global $LANG04;
+    global $_CONF, $LANG04;
 
     $retval = '';
 
-    if (!empty ($msg)) {
-        $retval .= COM_startBlock ($LANG04[21], '',
-                           COM_getBlockTemplate ('_msg_block', 'header'))
-                . $msg
-                . COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
+    if (! empty($msg)) {
+        $retval .= COM_showMessageText($msg, $LANG04[21]);
     }
 
-    $retval .= loginform (true);
+    $retval .= loginform(true);
 
-    $retval .= newuserform ();
+    if (! $_CONF['disable_new_user_registration']) {
+        $retval .= newuserform();
+    }
 
-    $retval .= getpasswordform ();
+    $retval .= getpasswordform();
 
     return $retval;
 }