[geeklog-cvs] Geeklog-1.x/public_html/admin mail.php, 1.34, 1.35 user.php, 1.201, 1.202

[Blaine Lang]

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/admin
In directory qs1489.pair.com:/tmp/cvs-serv84861

Modified Files:
	mail.php user.php 
Log Message:
Found a function name conflict 'display_form' so the names have been changed to better define their use.

Index: mail.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/mail.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** mail.php	25 Nov 2007 06:58:55 -0000	1.34
--- mail.php	5 May 2008 00:30:37 -0000	1.35
***************
*** 38,42 ****
  $display = '';
  
! // Make sure user has access to this page  
  if (!SEC_inGroup ('Mail Admin') && !SEC_hasrights ('user.mail')) {
      $retval .= COM_siteHeader ('menu', $MESSAGE[30]);
--- 38,42 ----
  $display = '';
  
! // Make sure user has access to this page
  if (!SEC_inGroup ('Mail Admin') && !SEC_hasrights ('user.mail')) {
      $retval .= COM_siteHeader ('menu', $MESSAGE[30]);
***************
*** 58,62 ****
  *
  */
! function display_form ()
  {
      global $_CONF, $_TABLES, $_USER, $LANG31;
--- 58,62 ----
  *
  */
! function display_mailform ()
  {
      global $_CONF, $_TABLES, $_USER, $LANG31;
***************
*** 123,127 ****
  {
      global $_CONF, $_TABLES, $LANG31;
!     
      require_once($_CONF['path_system'] . 'lib-user.php');
  
--- 123,127 ----
  {
      global $_CONF, $_TABLES, $LANG31;
! 
      require_once($_CONF['path_system'] . 'lib-user.php');
  
***************
*** 147,156 ****
  
      // If you want to send html mail
!     if (isset ($vars['html'])) { 
          $html = true;
      } else {
          $html = false;
      }
!     
      $groupList = implode (',', USER_getChildGroups($vars['to_group']));
  
--- 147,156 ----
  
      // If you want to send html mail
!     if (isset ($vars['html'])) {
          $html = true;
      } else {
          $html = false;
      }
! 
      $groupList = implode (',', USER_getChildGroups($vars['to_group']));
  
***************
*** 229,233 ****
      $display .= send_messages ($_POST);
  } else {
!     $display .= display_form ();
  }
  
--- 229,233 ----
      $display .= send_messages ($_POST);
  } else {
!     $display .= display_mailform ();
  }
  

Index: user.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/user.php,v
retrieving revision 1.201
retrieving revision 1.202
diff -C2 -d -r1.201 -r1.202
*** user.php	24 Feb 2008 19:43:53 -0000	1.201
--- user.php	5 May 2008 00:30:37 -0000	1.202
***************
*** 810,814 ****
      );
      $listoptions = array('chkdelete' => true, 'chkfield' => 'uid');
!     
      $menu_arr = array (
          array('url' => $_CONF['site_admin_url'] . '/user.php',
--- 810,814 ----
      );
      $listoptions = array('chkdelete' => true, 'chkfield' => 'uid');
! 
      $menu_arr = array (
          array('url' => $_CONF['site_admin_url'] . '/user.php',
***************
*** 1091,1095 ****
  *
  */
! function display_form ()
  {
      global $_CONF, $LANG28;
--- 1091,1095 ----
  *
  */
! function display_batchAddform ()
  {
      global $_CONF, $LANG28;
***************
*** 1201,1205 ****
                          COM_getBlockTemplate ('_admin_block', 'header'));
      $display .= $LANG28[25] . '<br' . XHTML . '><br' . XHTML . '>';
!     $display .= display_form();
      $display .= COM_endBlock (COM_getBlockTemplate ('_admin_block', 'footer'));
      $display .= COM_siteFooter();
--- 1201,1205 ----
                          COM_getBlockTemplate ('_admin_block', 'header'));
      $display .= $LANG28[25] . '<br' . XHTML . '><br' . XHTML . '>';
!     $display .= display_batchAddform();
      $display .= COM_endBlock (COM_getBlockTemplate ('_admin_block', 'footer'));
      $display .= COM_siteFooter();