[Phpgroupware-cvs] CVS: img/inc class.img.inc.php,1.6,1.7 class.soimg.inc.php,1.6,1.7 class.uiimg.inc.php,1.11,1.12

[Miles Lott <address@hidden>]

Update of /cvsroot/phpgroupware/img/inc
In directory subversions:/tmp/cvs-serv20858

Modified Files:
        class.img.inc.php class.soimg.inc.php class.uiimg.inc.php 
Log Message:
php3 fix; use php_ext class to test for gd extension; fix reference to grants 
var



Index: class.img.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/img/inc/class.img.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** class.img.inc.php   18 Dec 2001 18:18:24 -0000      1.6
--- class.img.inc.php   21 Apr 2002 23:04:30 -0000      1.7
***************
*** 47,55 ****
                        $this->docroot = 
$GLOBALS['HTTP_SERVER_VARS']['DOCUMENT_ROOT'];
  
!                       if(!function_exists('imagecreate'))
                        {
                                echo 'No GD support in this PHP install!';
                                exit;
                        }
  
                        $this->tmpdir  = 
$GLOBALS['phpgw_info']['server']['temp_dir'] . SEP;
--- 47,57 ----
                        $this->docroot = 
$GLOBALS['HTTP_SERVER_VARS']['DOCUMENT_ROOT'];
  
!                       $test = CreateObject('phpgwapi.php_ext');
!                       if(!$test->check('gd',True))
                        {
                                echo 'No GD support in this PHP install!';
                                exit;
                        }
+                       unset($test);
  
                        $this->tmpdir  = 
$GLOBALS['phpgw_info']['server']['temp_dir'] . SEP;

Index: class.soimg.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/img/inc/class.soimg.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** class.soimg.inc.php 5 Jan 2002 22:41:12 -0000       1.6
--- class.soimg.inc.php 21 Apr 2002 23:04:30 -0000      1.7
***************
*** 136,140 ****
                                $id = $id['img_id'];
                        }
!                       if (!(($this->bo->grants[$check['img_owner']] & 
PHPGW_ACL_DELETE) ||
                                $check['img_owner'] == 
$GLOBALS['phpgw_info']['user']['account_id']))
  
--- 136,140 ----
                                $id = $id['img_id'];
                        }
!                       if (!(($this->grants[$check['img_owner']] & 
PHPGW_ACL_DELETE) ||
                                $check['img_owner'] == 
$GLOBALS['phpgw_info']['user']['account_id']))
  

Index: class.uiimg.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/img/inc/class.uiimg.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** class.uiimg.inc.php 30 Dec 2001 21:56:05 -0000      1.11
--- class.uiimg.inc.php 21 Apr 2002 23:04:30 -0000      1.12
***************
*** 48,52 ****
                function uiimg()
                {
!                       $this->docroot    = 
$GLOBALS['HTTP_SERVER_VARS']['DOCUMENT_ROOT'];
                        $this->bo         = 
CreateObject('img.boimg',$this->debug);
                        $this->cat        = CreateObject('phpgwapi.categories');
--- 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');