[geeklog-cvs] Geeklog-1.x/system lib-custom.php, 1.40, 1.41 lib-user.php, 1.46, 1.47

[Blaine Lang]

Update of /cvsroot/geeklog/Geeklog-1.x/system
In directory qs1489.pair.com:/tmp/cvs-serv97301

Modified Files:
	lib-custom.php lib-user.php 
Log Message:
Added optional parm to the CUSTOM_userCreate function that is used to detect being called from the Admin->user Batch Add feature vs the registration form 
Required a new parm to be added to function USER_createAccount()

Index: lib-user.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/lib-user.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** lib-user.php	5 May 2008 20:04:38 -0000	1.46
--- lib-user.php	1 Aug 2008 18:49:09 -0000	1.47
***************
*** 238,250 ****
  * NOTE: Does NOT send out password emails.
  *
! * @param    string  $username   user name (mandatory)
! * @param    string  $email      user's email address (mandatory)
! * @param    string  $passwd     password (optional, see above)
! * @param    string  $fullname   user's full name (optional)
! * @param    string  $homepage   user's home page (optional)
! * @return   int                 new user's ID
  *
  */
! function USER_createAccount ($username, $email, $passwd = '', $fullname = '', $homepage = '', $remoteusername = '', $service = '')
  {
      global $_CONF, $_TABLES;
--- 238,251 ----
  * NOTE: Does NOT send out password emails.
  *
! * @param    string  $username    user name (mandatory)
! * @param    string  $email       user's email address (mandatory)
! * @param    string  $passwd      password (optional, see above)
! * @param    string  $fullname    user's full name (optional)
! * @param    string  $homepage    user's home page (optional)
! * @param    boolean $batchimport set to true when called from importuser() in admin/users.php (optional)
! * @return   int                  new user's ID
  *
  */
! function USER_createAccount ($username, $email, $passwd = '', $fullname = '', $homepage = '', $remoteusername = '', $service = '',$batchimport=false)
  {
      global $_CONF, $_TABLES;
***************
*** 324,328 ****
      // call custom registration function and plugins
      if ($_CONF['custom_registration'] && (function_exists ('CUSTOM_userCreate'))) {
!         CUSTOM_userCreate ($uid);
      }
      PLG_createUser ($uid);
--- 325,329 ----
      // call custom registration function and plugins
      if ($_CONF['custom_registration'] && (function_exists ('CUSTOM_userCreate'))) {
!         CUSTOM_userCreate ($uid,$batchimport);
      }
      PLG_createUser ($uid);

Index: lib-custom.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/lib-custom.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** lib-custom.php	31 May 2008 19:49:36 -0000	1.40
--- lib-custom.php	1 Aug 2008 18:49:09 -0000	1.41
***************
*** 137,140 ****
--- 137,143 ----
      Sample is provided under /system with the distribution.
  
+     Note3: Optional parm $bulkimport added so that if your using the [Batch Add] feature,
+     you can execute different logic if required.
+ 
      Functions have been provided that are called from the Core Geeklog user and admin functions
      - This works with User Moderation as well
***************
*** 148,152 ****
  /* Update any fields in the core GL tables for this user as needed */
  /* Called when user is first created */
! function CUSTOM_userCreate ($uid)
  {
      global $_CONF, $_TABLES;
--- 151,155 ----
  /* Update any fields in the core GL tables for this user as needed */
  /* Called when user is first created */
! function CUSTOM_userCreate ($uid,$bulkimport=false)
  {
      global $_CONF, $_TABLES;