[Phpgroupware-cvs] phpgwapi/inc class.common.inc.php, 1.216, 1.217 class.nextmatchs.inc.php, 1.63, 1.64

[Bettina Gille <address@hidden>]

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

Modified Files:
        class.common.inc.php class.nextmatchs.inc.php 
Log Message:
addressmaster

Index: class.nextmatchs.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.nextmatchs.inc.php,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** class.nextmatchs.inc.php    11 Nov 2003 12:46:30 -0000      1.63
--- class.nextmatchs.inc.php    11 Nov 2003 16:42:08 -0000      1.64
***************
*** 95,113 ****
                function set_icon($align,$img,$label)
                {
-                       
switch(strtolower($GLOBALS['phpgw_info']['user']['account_lid']))
-                       {
-                               case 'ceb':
-                                       $border = 0;
-                                       break;
-                               default:
-                                       $border = 0;
-                                       break;
-                       }
- 
                        $var = array(
!                               'align'  => $align,
!                               'img'    => 
$GLOBALS['phpgw']->common->image('phpgwapi',$img),
!                               'label'  => lang($label),
!                               'border' => $border
                        );
                        $this->template->set_var($var);
--- 95,104 ----
                function set_icon($align,$img,$label)
                {
                        $var = array(
!                               'align'         => $align,
!                               'img'           => 
$GLOBALS['phpgw']->common->image('phpgwapi',$img),
!                               'label'         => lang($label),
!                               'width'         => 
($GLOBALS['phpgw_info']['user']['preferences']['common']['template_set']=='funkwerk'?'13':'10'),
!                               'height'        => 
($GLOBALS['phpgw_info']['user']['preferences']['common']['template_set']=='funkwerk'?'5':'12')
                        );
                        $this->template->set_var($var);
***************
*** 720,723 ****
--- 711,716 ----
                        $data = array
                        (
+                               'img_width'                     => 
($GLOBALS['phpgw_info']['user']['preferences']['common']['template_set']=='funkwerk'?'13':'12'),
+                               'img_height'            => 
($GLOBALS['phpgw_info']['user']['preferences']['common']['template_set']=='funkwerk'?'5':'12'),
                                'allow_all_rows'        => 
(isset($values['allow_all_rows'])?False:'yes'),
                                'start_record'          => 
intval($values['start']),

Index: class.common.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.common.inc.php,v
retrieving revision 1.216
retrieving revision 1.217
diff -C2 -d -r1.216 -r1.217
*** class.common.inc.php        10 Nov 2003 17:31:38 -0000      1.216
--- class.common.inc.php        11 Nov 2003 16:42:07 -0000      1.217
***************
*** 897,901 ****
                                {
                                        case 1:
!                                               $imgpref = 
Array('png','jpg','gif');
                                                break;
                                        case 2:
--- 897,901 ----
                                {
                                        case 1:
!                                               $imgpref = 
Array('gif','jpg','png');
                                                break;
                                        case 2:
***************
*** 903,907 ****
                                                break;
                                        default:
!                                               $imgpref = 
Array('gif','jpg','png');
                                                break;
                                }
--- 903,907 ----
                                                break;
                                        default:
!                                               $imgpref = 
Array('png','jpg','gif');
                                                break;
                                }