[Phpgroupware-cvs] CVS: phpgwapi/inc class.common.inc.php,1.123,1.124

[Dan Kuykendall <address@hidden>]

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

Modified Files:
        class.common.inc.php 
Log Message:
allows image pref order

Index: class.common.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.common.inc.php,v
retrieving revision 1.123
retrieving revision 1.124
diff -C2 -r1.123 -r1.124
*** class.common.inc.php        8 Jan 2002 03:37:51 -0000       1.123
--- class.common.inc.php        21 Jan 2002 17:51:54 -0000      1.124
***************
*** 777,780 ****
--- 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]))
                        {
***************
*** 823,837 ****
                        }
  
!                       if(isset($this->found_files[$appname][$image.'.png']))
                        {
!                               $imgfile = 
$GLOBALS['phpgw_info']['server']['webserver_url'].$this->found_files[$appname][$image.'.png'].'/'.$image.'.png';
                        }
!                       
elseif(isset($this->found_files[$appname][$image.'.jpg']))
                        {
!                               $imgfile = 
$GLOBALS['phpgw_info']['server']['webserver_url'].$this->found_files[$appname][$image.'.jpg'].'/'.$image.'.jpg';
                        }
!                       
elseif(isset($this->found_files[$appname][$image.'.gif']))
                        {
!                               $imgfile = 
$GLOBALS['phpgw_info']['server']['webserver_url'].$this->found_files[$appname][$image.'.gif'].'/'.$image.'.gif';
                        }
                        elseif(isset($this->found_files[$appname][$image]))
--- 833,847 ----
                        }
  
!                       
if(isset($this->found_files[$appname][$image.'.'.$imgpref[0]]))
                        {
!                               $imgfile = 
$GLOBALS['phpgw_info']['server']['webserver_url'].$this->found_files[$appname][$image.'.'.$imgpref[0]].'/'.$image.'.'.$imgpref[0];
                        }
!                       
elseif(isset($this->found_files[$appname][$image.'.'.$imgpref[1]]))
                        {
!                               $imgfile = 
$GLOBALS['phpgw_info']['server']['webserver_url'].$this->found_files[$appname][$image.'.'.$imgpref[1]].'/'.$image.'.'.$imgpref[1];
                        }
!                       
elseif(isset($this->found_files[$appname][$image.'.'.$imgpref[2]]))
                        {
!                               $imgfile = 
$GLOBALS['phpgw_info']['server']['webserver_url'].$this->found_files[$appname][$image.'.'.$imgpref[2]].'/'.$image.'.'.$imgpref[2];
                        }
                        elseif(isset($this->found_files[$appname][$image]))
***************
*** 839,853 ****
                                $imgfile = 
$GLOBALS['phpgw_info']['server']['webserver_url'].$this->found_files[$appname][$image].'/'.$image;
                        }
!                       
elseif(isset($this->found_files['phpgwapi'][$image.'.png']))
                        {
!                               $imgfile = 
$GLOBALS['phpgw_info']['server']['webserver_url'].$this->found_files['phpgwapi'][$image.'.png'].'/'.$image.'.png';
                        }
!                       
elseif(isset($this->found_files['phpgwapi'][$image.'.jpg']))
                        {
!                               $imgfile = 
$GLOBALS['phpgw_info']['server']['webserver_url'].$this->found_files['phpgwapi'][$image.'.jpg'].'/'.$image.'.jpg';
                        }
!                       
elseif(isset($this->found_files['phpgwapi'][$image.'.gif']))
                        {
!                               $imgfile = 
$GLOBALS['phpgw_info']['server']['webserver_url'].$this->found_files['phpgwapi'][$image.'.gif'].'/'.$image.'.gif';
                        }
                        elseif(isset($this->found_files['phpgwapi'][$image]))
--- 849,863 ----
                                $imgfile = 
$GLOBALS['phpgw_info']['server']['webserver_url'].$this->found_files[$appname][$image].'/'.$image;
                        }
!                       
elseif(isset($this->found_files['phpgwapi'][$image.'.'.$imgpref[0]]))
                        {
!                               $imgfile = 
$GLOBALS['phpgw_info']['server']['webserver_url'].$this->found_files['phpgwapi'][$image.'.'.$imgpref[0]].'/'.$image.'.'.$imgpref[0];
                        }
!                       
elseif(isset($this->found_files['phpgwapi'][$image.'.'.$imgpref[1]]))
                        {
!                               $imgfile = 
$GLOBALS['phpgw_info']['server']['webserver_url'].$this->found_files['phpgwapi'][$image.'.'.$imgpref[1]].'/'.$image.'.'.$imgpref[1];
                        }
!                       
elseif(isset($this->found_files['phpgwapi'][$image.'.'.$imgpref[2]]))
                        {
!                               $imgfile = 
$GLOBALS['phpgw_info']['server']['webserver_url'].$this->found_files['phpgwapi'][$image.'.'.$imgpref[2]].'/'.$image.'.'.$imgpref[2];
                        }
                        elseif(isset($this->found_files['phpgwapi'][$image]))