[geeklog-cvs] geeklog-1.3/public_html/admin auth.inc.php,1.19,1.20 group.php,1.37,1.38 mail.php,1.22,1.23

[dhaun at iowaoutdoors.org]

Update of /var/cvs/geeklog-1.3/public_html/admin
In directory www:/tmp/cvs-serv16143/public_html/admin

Modified Files:
	auth.inc.php group.php mail.php 
Log Message:
Use $HTTP_SERVER_VARS['PHP_SELF'] instead of $PHP_SELF


Index: auth.inc.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/admin/auth.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** auth.inc.php	17 Jun 2004 11:15:29 -0000	1.19
--- auth.inc.php	9 Aug 2004 07:56:22 -0000	1.20
***************
*** 6,11 ****
  // +---------------------------------------------------------------------------+
  // | auth.inc.php                                                              |
- // | Geeklog admin authentication module                                       |
  // |                                                                           |
  // +---------------------------------------------------------------------------+
  // | Copyright (C) 2000-2004 by the following authors:                         |
--- 6,11 ----
  // +---------------------------------------------------------------------------+
  // | auth.inc.php                                                              |
  // |                                                                           |
+ // | Geeklog admin authentication module                                       |
  // +---------------------------------------------------------------------------+
  // | Copyright (C) 2000-2004 by the following authors:                         |
***************
*** 35,39 ****
  
  // this file can't be used on its own
! if (eregi ('auth.inc.php', $PHP_SELF))
  {
      die ('This file can not be used on its own.');
--- 35,39 ----
  
  // this file can't be used on its own
! if (eregi ('auth.inc.php', $HTTP_SERVER_VARS['PHP_SELF']))
  {
      die ('This file can not be used on its own.');
***************
*** 89,96 ****
          $display .= $LANG20[02]
          .'<br><br>'
!         .COM_accessLog($LANG20[03]);
      }
  	
!     $display .= '<form action="'.$PHP_SELF.'" method="POST">'
          .'<table cellspacing="0" cellpadding="0" border="0" width="100%">'.LB
          .'<tr><td align="right">'.$LANG20[04].' </td>'.LB
--- 89,97 ----
          $display .= $LANG20[02]
          .'<br><br>'
!         .COM_accessLog($LANG20[03] . ' ' . $loginname);
      }
  	
!     $display .= '<form action="' . $HTTP_SERVER_VARS['PHP_SELF']
!              . '" method="POST">'
          .'<table cellspacing="0" cellpadding="0" border="0" width="100%">'.LB
          .'<tr><td align="right">'.$LANG20[04].' </td>'.LB

Index: mail.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/admin/mail.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** mail.php	14 Jul 2004 18:34:57 -0000	1.22
--- mail.php	9 Aug 2004 07:56:22 -0000	1.23
***************
*** 60,64 ****
  function display_form ()
  {
!     global $_CONF, $_TABLES, $_USER, $LANG31, $PHP_SELF;
  
      $retval = '';
--- 60,64 ----
  function display_form ()
  {
!     global $_CONF, $_TABLES, $_USER, $LANG31, $HTTP_SERVER_VARS;
  
      $retval = '';
***************
*** 70,74 ****
      $mail_templates->set_var ('startblock_email', COM_startBlock ($LANG31[1],
              '', COM_getBlockTemplate ('_admin_block', 'header')));
!     $mail_templates->set_var ('php_self', $PHP_SELF);
      $mail_templates->set_var ('lang_note', $LANG31[19]);
      $mail_templates->set_var ('lang_to', $LANG31[18]);
--- 70,74 ----
      $mail_templates->set_var ('startblock_email', COM_startBlock ($LANG31[1],
              '', COM_getBlockTemplate ('_admin_block', 'header')));
!     $mail_templates->set_var ('php_self', $HTTP_SERVER_VARS['PHP_SELF']);
      $mail_templates->set_var ('lang_note', $LANG31[19]);
      $mail_templates->set_var ('lang_to', $LANG31[18]);

Index: group.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/admin/group.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** group.php	24 Jul 2004 18:26:32 -0000	1.37
--- group.php	9 Aug 2004 07:56:22 -0000	1.38
***************
*** 674,678 ****
  function editusers ($group)
  {
!     global $_CONF, $_TABLES, $_USER, $LANG_ACCESS;
  
      $thisUsersGroups = SEC_getUserGroups ();
--- 674,678 ----
  function editusers ($group)
  {
!     global $_CONF, $_TABLES, $_USER, $LANG_ACCESS, $HTTP_SERVER_VARS;
  
      $thisUsersGroups = SEC_getUserGroups ();
***************
*** 698,702 ****
      $groupmembers->set_file (array ('groupmembers'=>'groupmembers.thtml'));
      $groupmembers->set_var ('site_url',$_CONF['site_url']);
!     $groupmembers->set_var ('phpself',$PHP_SELF);
      $groupmembers->set_var ('LANG_sitemembers',$LANG_ACCESS['availmembers']);
      $groupmembers->set_var ('LANG_grpmembers',$LANG_ACCESS['groupmembers']);
--- 698,702 ----
      $groupmembers->set_file (array ('groupmembers'=>'groupmembers.thtml'));
      $groupmembers->set_var ('site_url',$_CONF['site_url']);
!     $groupmembers->set_var ('phpself', $HTTP_SERVER_VARS['PHP_SELF']);
      $groupmembers->set_var ('LANG_sitemembers',$LANG_ACCESS['availmembers']);
      $groupmembers->set_var ('LANG_grpmembers',$LANG_ACCESS['groupmembers']);