[Phpgroupware-cvs] CVS: phpgwapi/inc class.common.inc.php,1.162,1.163

[Bettina Gille <address@hidden>]

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

Modified Files:
        class.common.inc.php 
Log Message:
update img functions

Index: class.common.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.common.inc.php,v
retrieving revision 1.162
retrieving revision 1.163
diff -C2 -r1.162 -r1.163
*** class.common.inc.php        3 Oct 2002 02:49:22 -0000       1.162
--- class.common.inc.php        6 Oct 2002 03:06:03 -0000       1.163
***************
*** 731,735 ****
                @param $appname application name optional can be derived from 
$phpgw_info['flags']['currentapp'];
                */
!               function get_image_dir($appname = '')
                {
                        if ($appname == '')
--- 731,735 ----
                @param $appname application name optional can be derived from 
$phpgw_info['flags']['currentapp'];
                */
!               function get_image_dir($appname = '',$layout = '')
                {
                        if ($appname == '')
***************
*** 742,747 ****
                        }
  
!                       $imagedir            = PHPGW_SERVER_ROOT . '/' . 
$appname . '/templates/'
!                               . 
$GLOBALS['phpgw_info']['server']['template_set'] . '/images';
                        $imagedir_default    = PHPGW_SERVER_ROOT . '/' . 
$appname . '/templates/default/images';
                        $imagedir_olddefault = PHPGW_SERVER_ROOT . '/' . 
$appname . '/images';
--- 742,755 ----
                        }
  
!                       if ($layout)
!                       {
!                               $imagedir_layout = PHPGW_SERVER_ROOT . SEP . 
$appname . SEP . 'templates' . SEP . $layout . SEP . 'images';
!                               if (@is_dir ($imagedir_layout))
!                               {
!                                       return $imagedir_layout;
!                               }
!                       }
! 
!                       $imagedir            = PHPGW_SERVER_ROOT . '/' . 
$appname . '/templates/' . $GLOBALS['phpgw_info']['server']['template_set'] . 
'/images';
                        $imagedir_default    = PHPGW_SERVER_ROOT . '/' . 
$appname . '/templates/default/images';
                        $imagedir_olddefault = PHPGW_SERVER_ROOT . '/' . 
$appname . '/images';
***************
*** 770,774 ****
                @param $appname appication name optional can be derived from 
$phpgw_info['flags']['currentapp'];
                */
!               function get_image_path($appname = '')
                {
                        if ($appname == '')
--- 778,782 ----
                @param $appname appication name optional can be derived from 
$phpgw_info['flags']['currentapp'];
                */
!               function get_image_path($appname = '',$layout = '')
                {
                        if ($appname == '')
***************
*** 780,783 ****
--- 788,800 ----
                        {
                                
$GLOBALS['phpgw_info']['server']['template_set'] = 'default';
+                       }
+ 
+                       if ($layout)
+                       {
+                               $imagedir_layout = PHPGW_SERVER_ROOT . SEP . 
$appname . SEP . 'templates' . SEP . $layout . SEP . 'images';
+                               if (@is_dir ($imagedir_layout))
+                               {
+                                       return 
$GLOBALS['phpgw_info']['server']['webserver_url'] . SEP . $appname . SEP . 
'templates' . SEP . $layout . SEP . 'images';
+                               }
                        }