[geeklog-cvs] geeklog-1.3/public_html users.php,1.67,1.68

[geeklog-cvs-admin at lists.geeklog.net]

Update of /usr/cvs/geeklog/geeklog-1.3/public_html
In directory geeklog_prod:/tmp/cvs-serv14692

Modified Files:
	users.php 
Log Message:
Make sure new users enter a username when registering with the site (bug #56).
When displaying the error message for this (or an invalid email address), make sure we're checking for (and calling) the custom registration form, if it exists.


Index: users.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/users.php,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** users.php	25 Jul 2003 08:11:28 -0000	1.67
--- users.php	22 Aug 2003 20:48:26 -0000	1.68
***************
*** 456,464 ****
  function createuser($username,$email) 
  {
!     global $_TABLES, $LANG04, $_CONF;
  
!     if (COM_isEmail($email)) {
  
!         $username = trim ($username);
  
          $ucount = DB_count($_TABLES['users'],'username',$username);
--- 456,464 ----
  function createuser($username,$email) 
  {
!     global $_CONF, $_TABLES, $LANG01, $LANG04;
  
!     $username = trim ($username);
  
!     if (COM_isEmail ($email) && !empty ($username)) {
  
          $ucount = DB_count($_TABLES['users'],'username',$username);
***************
*** 534,540 ****
          }
      } else {
!         $retval .= COM_siteHeader ('Menu')
!                 . newuserform ($LANG04[18])
!                 . COM_siteFooter();
      }
  
--- 534,549 ----
          }
      } else {
!         if (empty ($username)) {
!             $msg = $LANG01[32]; // invalid username
!         } else {
!             $msg = $LANG04[18]; // invalid email address
!         }
!         $retval .= COM_siteHeader ('menu');
!         if ($_CONF['custom_registration'] && function_exists(custom_userform)) {
!             $retval .= custom_userform ('new', '', $msg);
!         } else {
!             $retval .= newuserform ($msg);
!         }
!         $retval .= COM_siteFooter();
      }