[geeklog-cvs] geeklog: Call CUSTOM_userCheck from admin/user.php (bug #0000925)

[geeklog-cvs at lists.geeklog.net]

details:   http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/7db76f494446
changeset: 7352:7db76f494446
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Oct 03 19:34:59 2009 +0200
description:
Call CUSTOM_userCheck from admin/user.php (bug #0000925)

diffstat:

 public_html/admin/user.php |  12 ++++++++++++
 public_html/docs/history   |   5 ++++-
 2 files changed, 16 insertions(+), 1 deletions(-)

diffs (43 lines):

diff -r d9d8f9519bcc -r 7db76f494446 public_html/admin/user.php
--- a/public_html/admin/user.php	Sat Oct 03 16:32:24 2009 +0200
+++ b/public_html/admin/user.php	Sat Oct 03 19:34:59 2009 +0200
@@ -521,6 +521,18 @@
             return edituser($uid, 56);
         }
 
+        if ($_CONF['custom_registration'] &&
+                function_exists('CUSTOM_userCheck')) {
+            $ret = CUSTOM_userCheck($username, $email);
+            if (! empty($ret)) {
+                // need a numeric return value - otherwise use default message
+                if (! is_numeric($ret['number'])) {
+                    $ret['number'] = 400;
+                }
+                return edituser($uid, $ret['number']);
+            }
+        }
+
         if (empty ($uid) || !empty ($passwd)) {
             $passwd = SEC_encryptPassword($passwd);
         } else {
diff -r d9d8f9519bcc -r 7db76f494446 public_html/docs/history
--- a/public_html/docs/history	Sat Oct 03 16:32:24 2009 +0200
+++ b/public_html/docs/history	Sat Oct 03 19:34:59 2009 +0200
@@ -3,13 +3,16 @@
 Oct ??, 2009 (1.6.1)
 ------------
 
+- Call CUSTOM_userCheck from admin/user.php (bug #0000925) [Dirk]
+- You can now have one featured story per topic (feature request #0000750,
+  patch provided by Tom Homer)
 - Changing the Post Mode in Advanced Editor mode selected the wrong tab
   (bug #0000980, patch provided by dengen)
 - Made the former $cc parameter for COM_mail an optional array of additional
   email headers (using a string for that parameter still works as CC:) [Dirk]
 - Fixed reply notification for the very first comment (bug #0000973)
   [dengen, Dirk]
-- When an anonymous commentor left a name, use it in the comment notification
+- When an anonymous commenter left a name, use it in the comment notification
   email (bug #0000960) [Dirk]
 - Removed the CSRF token from all links to edit a comment. We only need it in
   the actual comment editor and it caused problems on the moderation page [Dirk]