[Phpgroupware-cvs] CVS: phpgwapi/inc class.common.inc.php,1.136,1.137

[Dan Kuykendall <address@hidden>]

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

Modified Files:
        class.common.inc.php 
Log Message:
bug in phpgw_header wasnt calling the msgbox, and also seperate msgbox_row 
block for more control over good and bad rows

Index: class.common.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.common.inc.php,v
retrieving revision 1.136
retrieving revision 1.137
diff -C2 -r1.136 -r1.137
*** class.common.inc.php        24 May 2002 19:15:24 -0000      1.136
--- class.common.inc.php        24 May 2002 20:47:28 -0000      1.137
***************
*** 985,989 ****
                        }
                        
$GLOBALS['phpgw']->template->set_block('common','msgbox_start');
!                       
$GLOBALS['phpgw']->template->set_block('common','msgbox_row');
                        
$GLOBALS['phpgw']->template->set_block('common','msgbox_end');
                        
$GLOBALS['phpgw']->template->fp('msgbox','msgbox_start');
--- 985,990 ----
                        }
                        
$GLOBALS['phpgw']->template->set_block('common','msgbox_start');
!                       
$GLOBALS['phpgw']->template->set_block('common','msgbox_row_good');
!                       
$GLOBALS['phpgw']->template->set_block('common','msgbox_row_bad');
                        
$GLOBALS['phpgw']->template->set_block('common','msgbox_end');
                        
$GLOBALS['phpgw']->template->fp('msgbox','msgbox_start');
***************
*** 995,1008 ****
                                while (list($key,$value) = each($text))
                                {
-                                       if ($value == True)
-                                       {
-                                               $type_img = 'good';
-                                               $type_img_alt = 'O';
-                                       }
-                                       else
-                                       {
-                                               $type_img = 'bad';
-                                               $type_img_alt = 'X';
-                                       }
                                        if ($row == 1)
                                        {
--- 996,999 ----
***************
*** 1017,1042 ****
  
                                        
$GLOBALS['phpgw']->template->set_var('msgbox_text',$key);
!                                       
$GLOBALS['phpgw']->template->set_var('msgbox_img',$type_img);
!                                       
$GLOBALS['phpgw']->template->set_var('msgbox_img_alt',$type_img_alt);
!                                       
$GLOBALS['phpgw']->template->fp('msgbox','msgbox_row',True);
                                }
                        }
                        else
                        {
                                if ($type == True)
                                {
!                                       $type_img = 'good';
!                                       $type_img_alt = 'O';
                                }
                                else
                                {
!                                       $type_img = 'bad';
!                                       $type_img_alt = 'X';
                                }
-                               
$GLOBALS['phpgw']->template->set_var('msgbox_row_color',$GLOBALS['phpgw_info']['theme']['row_on']);
-                               
$GLOBALS['phpgw']->template->set_var('msgbox_text',$text);
-                               
$GLOBALS['phpgw']->template->set_var('msgbox_img',$type_img);
-                               
$GLOBALS['phpgw']->template->set_var('msgbox_img_alt',$type_img_alt);
-                               
$GLOBALS['phpgw']->template->fp('msgbox','msgbox_row',True);
                        }
                        
$GLOBALS['phpgw']->template->fp('msgbox','msgbox_end',True);
--- 1008,1033 ----
  
                                        
$GLOBALS['phpgw']->template->set_var('msgbox_text',$key);
!                                       if ($value == True)
!                                       {
!                                               
$GLOBALS['phpgw']->template->fp('msgbox','msgbox_row_good',True);
!                                       }
!                                       else
!                                       {
!                                               
$GLOBALS['phpgw']->template->fp('msgbox','msgbox_row_bad',True);
!                                       }
                                }
                        }
                        else
                        {
+                               
$GLOBALS['phpgw']->template->set_var('msgbox_row_color',$GLOBALS['phpgw_info']['theme']['row_on']);
+                               
$GLOBALS['phpgw']->template->set_var('msgbox_text',$text);
                                if ($type == True)
                                {
!                                       
$GLOBALS['phpgw']->template->fp('msgbox','msgbox_row_good',True);
                                }
                                else
                                {
!                                       
$GLOBALS['phpgw']->template->fp('msgbox','msgbox_row_bad',True);
                                }
                        }
                        
$GLOBALS['phpgw']->template->fp('msgbox','msgbox_end',True);
***************
*** 1187,1191 ****
                        if (address@hidden'phpgw_info']['flags']['noheader'] && 
address@hidden'phpgw_info']['flags']['nonavbar'])
                        {
!                               
$GLOBALS['phpgw_info']['flags']['msgbox_data']['Access not permitted']=False;
                                
$GLOBALS['phpgw']->hooks->process('after_navbar');
                        }
--- 1178,1182 ----
                        if (address@hidden'phpgw_info']['flags']['noheader'] && 
address@hidden'phpgw_info']['flags']['nonavbar'])
                        {
!                               $this->msgbox('',False,'out');
                                
$GLOBALS['phpgw']->hooks->process('after_navbar');
                        }