[Phpgroupware-cvs] CVS: dj adddirectory.php,1.3,1.4 delete.php,1.5,1.6 deletedirectory.php,1.4,1.5 editdirectory.php,1.3,1.4 import.php,1.11,1.12 request.php,1.7,1.8 show.php,1.8,1.9

[Mark A Peters <address@hidden>]

Update of /cvsroot/phpgroupware/dj
In directory subversions:/tmp/cvs-serv31394

Modified Files:
        adddirectory.php delete.php deletedirectory.php 
        editdirectory.php import.php request.php show.php 
Log Message:
Converting to get_var() for all HTTP_*_VARS.

Index: adddirectory.php
===================================================================
RCS file: /cvsroot/phpgroupware/dj/adddirectory.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** adddirectory.php    15 Sep 2001 12:02:51 -0000      1.3
--- adddirectory.php    30 Apr 2002 18:27:02 -0000      1.4
***************
*** 12,16 ****
  /* $Id$ */
  
!       $GLOBALS['phpgw_info']["flags"]["currentapp"] = 'dj';
        include('../header.inc.php');
  
--- 12,16 ----
  /* $Id$ */
  
!       $GLOBALS['phpgw_info']['flags']['currentapp'] = 'dj';
        include('../header.inc.php');
  
***************
*** 19,27 ****
        $GLOBALS['phpgw']->template->set_block('form','edit','edithandle');
  
!       $submit = $HTTP_POST_VARS['submit'];
  
        if ($submit)
        {
!               $dir_name = $HTTP_POST_VARS['dir_name'];
  
                $errorcount = 0;
--- 19,27 ----
        $GLOBALS['phpgw']->template->set_block('form','edit','edithandle');
  
!       $submit = get_var('submit',Array('POST'));
  
        if ($submit)
        {
!               $dir_name = get_var('dir_name',Array('POST'));
  
                $errorcount = 0;

Index: delete.php
===================================================================
RCS file: /cvsroot/phpgroupware/dj/delete.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** delete.php  15 Sep 2001 12:02:51 -0000      1.5
--- delete.php  30 Apr 2002 18:27:02 -0000      1.6
***************
*** 25,29 ****
        include('../header.inc.php');
  
!       $song_id = $HTTP_POST_VARS['song_id'] ? $HTTP_POST_VARS['song_id'] : 
$HTTP_GET_VARS['song_id'];
  
        if (!$song_id)
--- 25,29 ----
        include('../header.inc.php');
  
!       $song_id = get_var('song_id',Array('GET','POST'));
  
        if (!$song_id)

Index: deletedirectory.php
===================================================================
RCS file: /cvsroot/phpgroupware/dj/deletedirectory.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** deletedirectory.php 15 Sep 2001 12:02:51 -0000      1.4
--- deletedirectory.php 30 Apr 2002 18:27:02 -0000      1.5
***************
*** 24,28 ****
        include('../header.inc.php');
  
!       $dir_id = $HTTP_POST_VARS['dir_id'] ? $HTTP_POST_VARS['dir_id'] : 
$HTTP_GET_VARS['dir_id'];
  
        if(!$GLOBALS['phpgw']->acl->check('run',1,'admin'))
--- 24,28 ----
        include('../header.inc.php');
  
!       $dir_id = get_var('dir_id',Array('GET','POST'));
  
        if(!$GLOBALS['phpgw']->acl->check('run',1,'admin'))

Index: editdirectory.php
===================================================================
RCS file: /cvsroot/phpgroupware/dj/editdirectory.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** editdirectory.php   15 Sep 2001 12:02:51 -0000      1.3
--- editdirectory.php   30 Apr 2002 18:27:02 -0000      1.4
***************
*** 15,21 ****
        include('../header.inc.php');
  
!       $submit = $HTTP_POST_VARS['submit'];
!       $dir_id = $HTTP_POST_VARS['dir_id'] ? $HTTP_POST_VARS['dir_id'] : 
$HTTP_GET_VARS['dir_id'];
!       $dir_name = $HTTP_POST_VARS['dir_name'] ? $HTTP_POST_VARS['dir_name'] : 
$HTTP_GET_VARS['dir_name'];
  
        if (!$dir_id)
--- 15,21 ----
        include('../header.inc.php');
  
!       $submit = get_var('submit',Array('POST'));
!       $dir_id = get_var('dir_id',Array('GET','POST'));
!       $dir_name = get_var('dir_name',Array('GET','POST'));
  
        if (!$dir_id)

Index: import.php
===================================================================
RCS file: /cvsroot/phpgroupware/dj/import.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** import.php  15 Sep 2001 12:02:51 -0000      1.11
--- import.php  30 Apr 2002 18:27:02 -0000      1.12
***************
*** 29,33 ****
        }
  
!       if (!$HTTP_POST_VARS['convert'])
        {
                $GLOBALS['phpgw']->template->set_file(array('import' => 
'import.tpl'));
--- 29,33 ----
        }
  
!       if (!get_var('convert',Array('POST')))
        {
                $GLOBALS['phpgw']->template->set_file(array('import' => 
'import.tpl'));
***************
*** 58,62 ****
        {
                $cats = CreateObject('phpgwapi.categories');
!               $fp = fopen($HTTP_POST_VARS['tsvfile'],'r');
                $num = 0;
                while ($data = fgets($fp,8000))
--- 58,62 ----
        {
                $cats = CreateObject('phpgwapi.categories');
!               $fp = fopen(get_var('tsvfile',Array('POST')),'r');
                $num = 0;
                while ($data = fgets($fp,8000))

Index: request.php
===================================================================
RCS file: /cvsroot/phpgroupware/dj/request.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** request.php 15 Sep 2001 12:05:51 -0000      1.7
--- request.php 30 Apr 2002 18:27:02 -0000      1.8
***************
*** 19,24 ****
        include('../header.inc.php');
  
!       $song_id  = $HTTP_POST_VARS['song_id']  ? $HTTP_POST_VARS['song_id']  : 
$HTTP_GET_VARS['song_id'];
!       $songlist = $HTTP_POST_VARS['songlist'] ? $HTTP_POST_VARS['songlist'] : 
$HTTP_GET_VARS['songlist'];
  
        if ($song_id)
--- 19,24 ----
        include('../header.inc.php');
  
!       $song_id  = get_var('song_id',Array('GET','POST'));
!       $songlist = get_var('songlist',Array('GET','POST'));
  
        if ($song_id)

Index: show.php
===================================================================
RCS file: /cvsroot/phpgroupware/dj/show.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** show.php    30 Sep 2001 06:31:55 -0000      1.8
--- show.php    30 Apr 2002 18:27:02 -0000      1.9
***************
*** 20,26 ****
        include('../header.inc.php');
  
!       $request = $HTTP_POST_VARS['request'] ? $HTTP_POST_VARS['request'] : 
$HTTP_GET_VARS['request'];
!       $addshow = $HTTP_POST_VARS['addshow'] ? $HTTP_POST_VARS['addshow'] : 
$HTTP_GET_VARS['addshow'];
!       $songlist = $HTTP_POST_VARS['songlist'] ? $HTTP_POST_VARS['songlist'] : 
$HTTP_GET_VARS['songlist'];
  
        if ($request)
--- 20,26 ----
        include('../header.inc.php');
  
!       $request = get_var('request',Array('GET','POST'));
!       $addshow = get_var('addshow',Array('GET','POST'));
!       $songlist = get_var('songlist',Array('GET','POST'));
  
        if ($request)