[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: img/inc class.boimg.inc.php,1.3,1.4 class.img.in
|
From: |
Mark A Peters <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: img/inc class.boimg.inc.php,1.3,1.4 class.img.inc.php,1.7,1.8 class.uiimg.inc.php,1.12,1.13 |
|
Date: |
Tue, 30 Apr 2002 13:41:42 -0400 |
Update of /cvsroot/phpgroupware/img/inc
In directory subversions:/tmp/cvs-serv24779
Modified Files:
class.boimg.inc.php class.img.inc.php class.uiimg.inc.php
Log Message:
Converting to get_var() for all HTTP_*_VARS.
Index: class.boimg.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/img/inc/class.boimg.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** class.boimg.inc.php 30 Dec 2001 21:56:05 -0000 1.3
--- class.boimg.inc.php 30 Apr 2002 17:41:40 -0000 1.4
***************
*** 39,49 ****
$this->grants = $this->so->grants;
! $start = $GLOBALS['HTTP_POST_VARS']['start'] ?
$GLOBALS['HTTP_POST_VARS']['start'] : $GLOBALS['HTTP_GET_VARS']['start'];
! $query = $GLOBALS['HTTP_POST_VARS']['query'] ?
$GLOBALS['HTTP_POST_VARS']['query'] : $GLOBALS['HTTP_GET_VARS']['query'];
! $sort = $GLOBALS['HTTP_POST_VARS']['sort'] ?
$GLOBALS['HTTP_POST_VARS']['sort'] : $GLOBALS['HTTP_GET_VARS']['sort'];
! $order = $GLOBALS['HTTP_POST_VARS']['order'] ?
$GLOBALS['HTTP_POST_VARS']['order'] : $GLOBALS['HTTP_GET_VARS']['order'];
! $filter = $GLOBALS['HTTP_POST_VARS']['filter'] ?
$GLOBALS['HTTP_POST_VARS']['filter'] : $GLOBALS['HTTP_GET_VARS']['filter'];
! $cat_id = $GLOBALS['HTTP_POST_VARS']['cat_id'] ?
$GLOBALS['HTTP_POST_VARS']['cat_id'] : $GLOBALS['HTTP_GET_VARS']['cat_id'];
! $fcat_id = $GLOBALS['HTTP_POST_VARS']['fcat_id'] ?
$GLOBALS['HTTP_POST_VARS']['fcat_id'] : $GLOBALS['HTTP_GET_VARS']['fcat_id'];
if(!empty($start) || ($start == '0') || ($start == 0))
--- 39,49 ----
$this->grants = $this->so->grants;
! $start = get_var('start',Array('GET','POST'));
! $query = get_var('query',Array('GET','POST'));
! $sort = get_var('sort',Array('GET','POST'));
! $order = get_var('order',Array('GET','POST'));
! $filter = get_var('filter',Array('GET','POST'));
! $cat_id = get_var('cat_id',Array('GET','POST'));
! $fcat_id = get_var('fcat_id',Array('GET','POST'));
if(!empty($start) || ($start == '0') || ($start == 0))
Index: class.img.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/img/inc/class.img.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** class.img.inc.php 21 Apr 2002 23:04:30 -0000 1.7
--- class.img.inc.php 30 Apr 2002 17:41:40 -0000 1.8
***************
*** 45,49 ****
$this->debug = $debug;
$this->angles = array(lang('Please
select'),'90','180','270');
! $this->docroot =
$GLOBALS['HTTP_SERVER_VARS']['DOCUMENT_ROOT'];
$test = CreateObject('phpgwapi.php_ext');
--- 45,49 ----
$this->debug = $debug;
$this->angles = array(lang('Please
select'),'90','180','270');
! $this->docroot =
get_var('DOCUMENT_ROOT',Array('SERVER'));
$test = CreateObject('phpgwapi.php_ext');
Index: class.uiimg.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/img/inc/class.uiimg.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** class.uiimg.inc.php 21 Apr 2002 23:04:30 -0000 1.12
--- class.uiimg.inc.php 30 Apr 2002 17:41:40 -0000 1.13
***************
*** 48,52 ****
function uiimg()
{
! $this->docroot =
$GLOBALS['HTTP_SERVER_VARS']['DOCUMENT_ROOT'] ?
$GLOBALS['HTTP_SERVER_VARS']['DOCUMENT_ROOT'] : $GLOBALS['DOCUMENT_ROOT'];
$this->bo =
CreateObject('img.boimg',$this->debug);
$this->cat = CreateObject('phpgwapi.categories');
--- 48,52 ----
function uiimg()
{
! $this->docroot =
get_var('DOCUMENT_ROOT',Array('GLOBAL','SERVER'));
$this->bo =
CreateObject('img.boimg',$this->debug);
$this->cat = CreateObject('phpgwapi.categories');
***************
*** 183,190 ****
if(!$id)
{
! $id = $GLOBALS['HTTP_GET_VARS']['img_id'] ?
$GLOBALS['HTTP_GET_VARS']['img_id'] : $GLOBALS['HTTP_POST_VARS']['img_id'];
}
! if($GLOBALS['HTTP_GET_VARS']['thumb'])
{
$cancel_url =
$GLOBALS['phpgw']->link('/index.php','menuaction=img.uiimg.thumbnails');
--- 183,190 ----
if(!$id)
{
! $id = get_var('img_id',Array('POST','GET'));
}
! if(get_var('thumb',Array('GET')))
{
$cancel_url =
$GLOBALS['phpgw']->link('/index.php','menuaction=img.uiimg.thumbnails');
***************
*** 195,203 ****
}
! if($GLOBALS['HTTP_POST_VARS']['cancel'])
{
Header('Location: ' .
$GLOBALS['phpgw']->link('img.uiimg.index'));
}
! elseif($GLOBALS['HTTP_POST_VARS']['edit'])
{
ExecMethod('img.uiimg.edit',$id);
--- 195,203 ----
}
! if(get_var('cancel',Array('POST')))
{
Header('Location: ' .
$GLOBALS['phpgw']->link('img.uiimg.index'));
}
! if(get_var('edit',Array('POST')))
{
ExecMethod('img.uiimg.edit',$id);
***************
*** 261,268 ****
function add()
{
! $posted = $GLOBALS['HTTP_POST_VARS']['entry'];
$img_file = $GLOBALS['HTTP_POST_FILES']['img_file'];
! if($GLOBALS['HTTP_POST_VARS']['cancel'])
{
Header('Location: ' .
$GLOBALS['phpgw']->link('img.uiimg.index'));
--- 261,268 ----
function add()
{
! $posted = get_var('entry',Array('POST'));
$img_file = $GLOBALS['HTTP_POST_FILES']['img_file'];
! if(get_var('cancel',Array('POST')))
{
Header('Location: ' .
$GLOBALS['phpgw']->link('img.uiimg.index'));
***************
*** 287,291 ****
$this->template->set_var('category_list',$this->cat->formated_list('select','all',$this->cat_id,True));
! if(!$GLOBALS['HTTP_POST_VARS']['submit'])
{
$GLOBALS['phpgw']->common->phpgw_header();
--- 287,291 ----
$this->template->set_var('category_list',$this->cat->formated_list('select','all',$this->cat_id,True));
! if(!get_var('submit',Array('POST')))
{
$GLOBALS['phpgw']->common->phpgw_header();
***************
*** 363,367 ****
'img_name' => $posted['img_name'],
'img_title' => $posted['img_title'],
! 'img_cat' =>
$GLOBALS['HTTP_POST_VARS']['fcat_id'],
'img_des' => $posted['img_des'],
'img_images' => $posted['img_images'],
--- 363,367 ----
'img_name' => $posted['img_name'],
'img_title' => $posted['img_title'],
! 'img_cat' =>
get_var('fcat_id',Array('POST')),
'img_des' => $posted['img_des'],
'img_images' => $posted['img_images'],
***************
*** 387,402 ****
if(!$id)
{
! $id = $GLOBALS['HTTP_GET_VARS']['img_id'] ?
$GLOBALS['HTTP_GET_VARS']['img_id'] :
$GLOBALS['HTTP_POST_VARS']['entry']['img_id'];
}
! if($GLOBALS['HTTP_POST_VARS']['cancel'])
{
Header('Location: ' .
$GLOBALS['phpgw']->link('index.php','menuaction=img.uiimg.index'));
}
! if($GLOBALS['HTTP_POST_VARS']['submit'])
{
! $posted = $GLOBALS['HTTP_POST_VARS']['entry'];
! $posted['img_cat'] =
$GLOBALS['HTTP_POST_VARS']['fcat_id'];
$img_file =
$GLOBALS['HTTP_POST_FILES']['img_file'];
--- 387,402 ----
if(!$id)
{
! $id = get_var('img_id',Array('POST','GET'));
}
! if(get_var('cancel',Array('POST')))
{
Header('Location: ' .
$GLOBALS['phpgw']->link('index.php','menuaction=img.uiimg.index'));
}
! if(get_var('submit',Array('POST')))
{
! $posted = get_var('entry',Array('POST'));
! $posted['img_cat'] =
get_var('fcat_id',Array('POST'));
$img_file =
$GLOBALS['HTTP_POST_FILES']['img_file'];
***************
*** 532,537 ****
function delete()
{
! $img_id = $GLOBALS['HTTP_GET_VARS']['img_id'] ?
$GLOBALS['HTTP_GET_VARS']['img_id'] : $GLOBALS['HTTP_POST_VARS']['img_id'];
! $confirm = $GLOBALS['HTTP_GET_VARS']['confirm'];
if (!$img_id)
--- 532,537 ----
function delete()
{
! $img_id = get_var('img_id',Array('POST','GET'));
! $confirm = get_var('confirm',Array('GET'));
if (!$img_id)
***************
*** 566,583 ****
function manipulate()
{
! $img_id = $GLOBALS['HTTP_POST_VARS']['img_id'];
! $save = $GLOBALS['HTTP_POST_VARS']['save'];
! // $action = $GLOBALS['HTTP_POST_VARS']['action']
! $convert = $GLOBALS['HTTP_POST_VARS']['convert'];
! $rotate = $GLOBALS['HTTP_POST_VARS']['rotate'];
! $resize = $GLOBALS['HTTP_POST_VARS']['resize'];
! $dstW = $GLOBALS['HTTP_POST_VARS']['dstW'];
! $dstH = $GLOBALS['HTTP_POST_VARS']['dstH'];
! $angle = $GLOBALS['HTTP_POST_VARS']['angle'];
! $thumbnail = $GLOBALS['HTTP_POST_VARS']['thumbnail'];
$imgWidth = $imgHeight = $imgType = '';
! $oldfile = $GLOBALS['HTTP_POST_VARS']['oldfile'] ?
$GLOBALS['HTTP_POST_VARS']['oldfile'] : $GLOBALS['HTTP_POST_VARS']['picture'];
if(!ereg("^$this->docroot",$oldfile))
{
--- 566,583 ----
function manipulate()
{
! $img_id = get_var('img_id',Array('POST'));
! $save = get_var('save',Array('POST'));
! // $action = get_var('action',Array('POST'));
! $convert = get_var('convert',Array('POST'));
! $rotate = get_var('rotate',Array('POST'));
! $resize = get_var('resize',Array('POST'));
! $dstW = get_var('dstW',Array('POST'));
! $dstH = get_var('dstH',Array('POST'));
! $angle = get_var('angle',Array('POST'));
! $thumbnail = get_var('thumbnail',Array('POST'));
$imgWidth = $imgHeight = $imgType = '';
! $oldfile =
get_var('oldfile',Array('DEFAULT','POST'),get_ar('picture',Array('POST')));
if(!ereg("^$this->docroot",$oldfile))
{
***************
*** 585,589 ****
}
! $picturefile = $GLOBALS['HTTP_POST_VARS']['picture'] ?
$GLOBALS['HTTP_POST_VARS']['picture'] :
$GLOBALS['HTTP_POST_FILES']['picturefile'];
if(!ereg("^$this->docroot",$picturefile))
{
--- 585,589 ----
}
! $picturefile =
get_var('picture',Array('DEFAULT','POST'),get_ar('picturefile',Array('POST')));
if(!ereg("^$this->docroot",$picturefile))
{
***************
*** 609,613 ****
}
! $conTo = $GLOBALS['HTTP_POST_VARS']['conTo'];
$GLOBALS['phpgw']->common->phpgw_header();
--- 609,613 ----
}
! $conTo = get_var('conTo',Array('POST'));
$GLOBALS['phpgw']->common->phpgw_header();
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: img/inc class.boimg.inc.php,1.3,1.4 class.img.inc.php,1.7,1.8 class.uiimg.inc.php,1.12,1.13,
Mark A Peters <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: admin/setup phpgw_de.lang,1.16,1.17
- Next by Date:
[Phpgroupware-cvs] CVS: headlines grabnewssites.php,1.7,1.8 preferences.php,1.21,1.22 preferences_other.php,1.1,1.2
- Previous by thread:
[Phpgroupware-cvs] CVS: admin/setup phpgw_de.lang,1.16,1.17
- Next by thread:
[Phpgroupware-cvs] CVS: headlines grabnewssites.php,1.7,1.8 preferences.php,1.21,1.22 preferences_other.php,1.1,1.2
- Index(es):