[geeklog-cvs] geeklog-1.3/public_html users.php,1.54,1.55

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

Update of /usr/cvs/geeklog/geeklog-1.3/public_html
In directory internal.geeklog.net:/tmp/cvs-serv20555

Modified Files:
	users.php 
Log Message:
When a new user registers, check for a valid email address first.


Index: users.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/users.php,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** users.php	23 Feb 2003 20:45:09 -0000	1.54
--- users.php	11 Apr 2003 08:19:10 -0000	1.55
***************
*** 391,406 ****
  {
      global $_TABLES, $LANG04, $_CONF;
! 	
!     $ucount = DB_count($_TABLES['users'],'username',$username);
!     $ecount = DB_count($_TABLES['users'],'email',$email);
! 	
!     if ($ucount == 0 AND $ecount == 0) {
!         if (COM_isEmail($email)) {
              $regdate = strftime('%Y-%m-%d %H:%M:$S',time());
              DB_save($_TABLES['users'],'username,email,regdate',"'$username','$email','$regdate'");
              $uid = DB_getItem($_TABLES['users'],'uid',"username = '$username'");
  
!             // Add user to Logged-in group (i.e. members) and the All Users group (which includes
!             // anonymous users
              $normal_grp = DB_getItem($_TABLES['groups'],'grp_id',"grp_name='Logged-in Users'");
              $all_grp = DB_getItem($_TABLES['groups'],'grp_id',"grp_name='All Users'");
--- 391,407 ----
  {
      global $_TABLES, $LANG04, $_CONF;
! 
!     if (COM_isEmail($email)) {
! 
!         $ucount = DB_count($_TABLES['users'],'username',$username);
!         $ecount = DB_count($_TABLES['users'],'email',$email);
! 
!         if ($ucount == 0 AND $ecount == 0) {
              $regdate = strftime('%Y-%m-%d %H:%M:$S',time());
              DB_save($_TABLES['users'],'username,email,regdate',"'$username','$email','$regdate'");
              $uid = DB_getItem($_TABLES['users'],'uid',"username = '$username'");
  
!             // Add user to Logged-in group (i.e. members) and the All Users
!             // group (which includes anonymous users
              $normal_grp = DB_getItem($_TABLES['groups'],'grp_id',"grp_name='Logged-in Users'");
              $all_grp = DB_getItem($_TABLES['groups'],'grp_id',"grp_name='All Users'");
***************
*** 446,452 ****
              DB_change($_TABLES['usercomment'],'commentlimit',$_CONF['comment_limit'],'uid',$uid); 
  
! 			// Call custom registration and account record create function if enabled and exists
    	        if ($_CONF['custom_registration'] AND (function_exists(custom_usercreate))) {
! 			    custom_usercreate($uid);
  			}
  
--- 447,454 ----
              DB_change($_TABLES['usercomment'],'commentlimit',$_CONF['comment_limit'],'uid',$uid); 
  
!             // Call custom registration and account record create function
!             // if enabled and exists
    	        if ($_CONF['custom_registration'] AND (function_exists(custom_usercreate))) {
!                 custom_usercreate($uid);
  			}
  
***************
*** 455,463 ****
              return COM_refresh($_CONF['site_url'] . '/index.php?msg=' . $msg);
          } else {
!             $retval .= COM_siteHeader('Menu') . newuserform($LANG04[18]) . COM_siteFooter();
          }
      } else {
!         $retval .= COM_siteHeader('Menu') . newuserform($LANG04[19]) . COM_siteFooter();
      }
      return $retval;
  }
--- 457,470 ----
              return COM_refresh($_CONF['site_url'] . '/index.php?msg=' . $msg);
          } else {
!             $retval .= COM_siteHeader ('Menu')
!                     . newuserform ($LANG04[19])
!                     . COM_siteFooter ();
          }
      } else {
!         $retval .= COM_siteHeader ('Menu')
!                 . newuserform ($LANG04[18])
!                 . COM_siteFooter();
      }
+ 
      return $retval;
  }