[geeklog-cvs] geeklog-1.3/public_html users.php,1.56,1.57

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

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

Modified Files:
	users.php 
Log Message:
Further edits for the custom registration feature

Index: users.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/users.php,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** users.php	16 Apr 2003 13:20:27 -0000	1.56
--- users.php	3 May 2003 18:28:21 -0000	1.57
***************
*** 457,468 ****
              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();
      }
  
--- 457,471 ----
              return COM_refresh($_CONF['site_url'] . '/index.php?msg=' . $msg);
          } else {
! 		    $retval .= COM_siteHeader('menu');
! 	        if ($_CONF['custom_registration'] AND (function_exists(custom_userform))) {
! 		        $retval .= custom_userform('new','',$LANG04[19]);
! 	        } else {
! 		        $retval .= newuserform($LANG04[19]);
! 	        }
          }
      } else {
          $retval .= COM_siteHeader ('Menu')
                  . newuserform ($LANG04[18])
!                 . COM_siteFooter ();
      }
  
***************
*** 634,638 ****
      $uid = strip_tags ($HTTP_GET_VARS['uid']);
      if (is_numeric ($uid)) {
!         $display .= COM_siteHeader('menu') . userprofile($uid) . COM_siteFooter();
      } else {
          $display .= COM_refresh ($_CONF['site_url'] . '/index.php');
--- 637,646 ----
      $uid = strip_tags ($HTTP_GET_VARS['uid']);
      if (is_numeric ($uid)) {
! 	    // Call custom registration and account record create function if enabled and exists
!         if ($_CONF['custom_registration'] AND (function_exists(custom_userform)) AND SEC_hasRights("user.edit")) {
!             $display .= COM_siteHeader('menu') . custom_userform('moderate',$uid) . COM_siteFooter();
! 	    } else {
! 		    $display .= COM_siteHeader('menu') . userprofile($uid) . COM_siteFooter();
!         }
      } else {
          $display .= COM_refresh ($_CONF['site_url'] . '/index.php');
***************
*** 651,661 ****
      break;
  case 'new':
-     $display .= COM_siteHeader('menu');
  	// Call custom registration and account record create function if enabled and exists
  	if ($_CONF['custom_registration'] AND (function_exists(custom_userform))) {
          $display .= custom_userform('new');
  	} else {
  	    $display .= newuserform($msg);
! 	}	
      $display .= COM_siteFooter();
      break;
--- 659,669 ----
      break;
  case 'new':
  	// Call custom registration and account record create function if enabled and exists
+     $display .= COM_siteHeader('menu');
  	if ($_CONF['custom_registration'] AND (function_exists(custom_userform))) {
          $display .= custom_userform('new');
  	} else {
  	    $display .= newuserform($msg);
! 	}		
      $display .= COM_siteFooter();
      break;