[Phpgroupware-cvs] wiki/action admin.php,1.6,1.6.2.1

[Dave Hall <address@hidden>]

Update of /cvsroot/phpgroupware/wiki/action
In directory subversions:/tmp/cvs-serv18377/action

Modified Files:
      Tag: Version-0_9_16-branch
        admin.php 
Log Message:
globals

Index: admin.php
===================================================================
RCS file: /cvsroot/phpgroupware/wiki/action/admin.php,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -d -r1.6 -r1.6.2.1
*** admin.php   7 Mar 2003 00:19:13 -0000       1.6
--- admin.php   9 Oct 2003 06:09:33 -0000       1.6.2.1
***************
*** 15,46 ****
  // Harvest script parameters.
  
! $REMOTE_ADDR = isset($HTTP_SERVER_VARS['REMOTE_ADDR'])
!                ? $HTTP_SERVER_VARS['REMOTE_ADDR'] : '';
  
! if(isset($HTTP_GET_VARS['locking']))
!   { $locking = $HTTP_GET_VARS['locking']; }
! if(isset($HTTP_GET_VARS['blocking']))
!   { $blocking = $HTTP_GET_VARS['blocking']; }
  if(!isset($locking))
  {
!   $locking  = isset($HTTP_POST_VARS['locking'])
!               ? $HTTP_POST_VARS['locking'] : '';
  }
  if(!isset($blocking))
  {
!   $blocking = isset($HTTP_POST_VARS['blocking'])
!               ? $HTTP_POST_VARS['blocking'] : '';
  }
  
! $Block   = isset($HTTP_POST_VARS['Block'])
!            ? $HTTP_POST_VARS['Block'] : '';
! $Unblock = isset($HTTP_POST_VARS['Unblock'])
!            ? $HTTP_POST_VARS['Unblock'] : '';
! $Save    = isset($HTTP_POST_VARS['Save'])
!            ? $HTTP_POST_VARS['Save'] : '';
! $address = isset($HTTP_POST_VARS['address'])
!            ? $HTTP_POST_VARS['address'] : '';
  
! $count = isset($HTTP_POST_VARS['count']) ? $HTTP_POST_VARS['count'] : 0;
  
  if($locking && $count > 0)
--- 15,46 ----
  // Harvest script parameters.
  
! $REMOTE_ADDR = isset($_SERVER['REMOTE_ADDR'])
!                ? $_SERVER['REMOTE_ADDR'] : '';
  
! if(isset($_GET['locking']))
!   { $locking = $_GET['locking']; }
! if(isset($_GET['blocking']))
!   { $blocking = $_GET['blocking']; }
  if(!isset($locking))
  {
!   $locking  = isset($_POST['locking'])
!               ? $_POST['locking'] : '';
  }
  if(!isset($blocking))
  {
!   $blocking = isset($_POST['blocking'])
!               ? $_POST['blocking'] : '';
  }
  
! $Block   = isset($_POST['Block'])
!            ? $_POST['Block'] : '';
! $Unblock = isset($_POST['Unblock'])
!            ? $_POST['Unblock'] : '';
! $Save    = isset($_POST['Save'])
!            ? $_POST['Save'] : '';
! $address = isset($_POST['address'])
!            ? $_POST['address'] : '';
  
! $count = isset($_POST['count']) ? $_POST['count'] : 0;
  
  if($locking && $count > 0)
***************
*** 49,55 ****
    {
      $var = 'name' + $i;
!     $$var = isset($HTTP_POST_VARS[$var]) ? $HTTP_POST_VARS[$var] : '';
      $var = 'lock' + $i;
!     $$var = isset($HTTP_POST_VARS[$var]) ? $HTTP_POST_VARS[$var] : '';
    }
  }
--- 49,55 ----
    {
      $var = 'name' + $i;
!     $$var = isset($_POST[$var]) ? $_POST[$var] : '';
      $var = 'lock' + $i;
!     $$var = isset($_POST[$var]) ? $_POST[$var] : '';
    }
  }
***************
*** 72,78 ****
      for($i = 1; $i <= $count; $i++)
      {
!       $page = urldecode($HTTP_POST_VARS['name' . $i]);
!       if(isset($HTTP_POST_VARS['lock' . $i]))
!         { $lock = $HTTP_POST_VARS['lock' . $i]; }
        else
          { $lock = 0; }
--- 72,78 ----
      for($i = 1; $i <= $count; $i++)
      {
!       $page = urldecode($_POST['name' . $i]);
!       if(isset($_POST['lock' . $i]))
!         { $lock = $_POST['lock' . $i]; }
        else
          { $lock = 0; }
***************
*** 80,84 ****
        $pg->read();
        $pg->version++;
!       $pg->hostname = gethostbyaddr($REMOTE_ADDR);
        $pg->username = $UserName;
        $pg->comment = '';
--- 80,84 ----
        $pg->read();
        $pg->version++;
!       $pg->hostname = gethostbyaddr($_SERVER['REMOTE_ADDR']);
        $pg->username = $UserName;
        $pg->comment = '';