[Phpgroupware-cvs] CVS: phpgwapi/inc class.Template.inc.php,1.14,1.15 class.common.inc.php,1.124,1.125

[Dan Kuykendall <address@hidden>]

Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv28974

Modified Files:
        class.Template.inc.php class.common.inc.php 
Log Message:
now only removes all gifs is policy is set

Index: class.Template.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.Template.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** class.Template.inc.php      21 Jan 2002 18:51:40 -0000      1.14
--- class.Template.inc.php      21 Jan 2002 19:04:57 -0000      1.15
***************
*** 334,339 ****
                                        break;
                        }
! 
!                       $str = str_replace (".gif", ".png",$str);
                        return $str;
                }
--- 334,342 ----
                                        break;
                        }
!                       /* If they want NOGIF policy, then I do a global 
replace */
!                       if 
($GLOBALS['phpgw_info']['server']['imgtype_preference'] == 2)
!                       {
!                               $str = str_replace (".gif", ".png",$str);
!                       }
                        return $str;
                }

Index: class.common.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.common.inc.php,v
retrieving revision 1.124
retrieving revision 1.125
diff -C2 -r1.124 -r1.125
*** class.common.inc.php        21 Jan 2002 17:51:54 -0000      1.124
--- class.common.inc.php        21 Jan 2002 19:04:57 -0000      1.125
***************
*** 777,790 ****
                function find_image($appname,$image)
                {
! 
!                       if 
(!isset($GLOBALS['phpgw_info']['server']['imgtype_preference_order']))
                        {
!                               $imgpref = Array('gif','jpg','png');
                        }
!                       else
!                       {
!                               $imgpref = 
$GLOBALS['phpgw_info']['server']['imgtype_preference_order'];
!                       }
!                               
                        if (address@hidden($this->found_files[$appname]))
                        {
--- 777,792 ----
                function find_image($appname,$image)
                {
!                       
switch($GLOBALS['phpgw_info']['server']['imgtype_preference'])
                        {
!                               case 1:
!                                       $imgpref = Array('gif','jpg','png');
!                                       break;
!                               case 2:
!                                       $imgpref = Array('png','jpg','nogifs');
!                                       break;
!                               default:
!                                       $imgpref = Array('png','jpg','gif');
                        }
!       
                        if (address@hidden($this->found_files[$appname]))
                        {