[Phpgroupware-cvs] CVS: phpgwapi/inc class.common.inc.php,1.166,1.167

[Bettina Gille <address@hidden>]

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

Modified Files:
        class.common.inc.php 
Log Message:
update msgbox

Index: class.common.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.common.inc.php,v
retrieving revision 1.166
retrieving revision 1.167
diff -C2 -r1.166 -r1.167
*** class.common.inc.php        19 Oct 2002 20:46:35 -0000      1.166
--- class.common.inc.php        20 Oct 2002 00:33:52 -0000      1.167
***************
*** 994,998 ****
                */
  
!               function msgbox($text='',$type=True)
                {
                        if ($text=='' && 
@isset($GLOBALS['phpgw_info']['flags']['msgbox_data']))
--- 994,998 ----
                */
  
!               function msgbox($text='',$type=True,$xslt=False)
                {
                        if ($text=='' && 
@isset($GLOBALS['phpgw_info']['flags']['msgbox_data']))
***************
*** 1006,1011 ****
                        }
  
!               //      $GLOBALS['phpgw']->xslttpl->add_file(array('msgbox'));
!                       
$GLOBALS['phpgw']->xslttpl->add_file(array($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
 . SEP . 'msgbox'));
  
                        $prev_helper = 
$GLOBALS['phpgw']->translation->translator_helper;
--- 1006,1010 ----
                        }
  
!                       
$GLOBALS['phpgw']->xslttpl->add_file($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
 . SEP . 'msgbox');
  
                        $prev_helper = 
$GLOBALS['phpgw']->translation->translator_helper;
***************
*** 1016,1020 ****
                                reset($text);
  
-                       //_debug_array($text);
                                while (list($key,$value) = each($text))
                                {
--- 1015,1018 ----
***************
*** 1030,1034 ****
                                        }
  
!                                       $data['msgbox_data'][] = array
                                        (
                                                'msgbox_text'                   
        => lang($key),
--- 1028,1032 ----
                                        }
  
!                                       $data[] = array
                                        (
                                                'msgbox_text'                   
        => lang($key),
***************
*** 1038,1044 ****
                                        );
                                }
- 
-                       //_debug_array($data);
- 
                        }
                        else
--- 1036,1039 ----
***************
*** 1055,1059 ****
                                }
  
!                               $data['msgbox_data'] = array
                                (
                                        'msgbox_text'                           
=> lang($text),
--- 1050,1054 ----
                                }
  
!                               $data = array
                                (
                                        'msgbox_text'                           
=> lang($text),
***************
*** 1065,1071 ****
  
                        $GLOBALS['phpgw']->translation->translator_helper = 
$prev_helper;
-                       $GLOBALS['phpgw']->xslttpl->set_var('msgbox',$data);
  
!                       return $GLOBALS['phpgw']->xslttpl->parse();
                }
  
--- 1060,1075 ----
  
                        $GLOBALS['phpgw']->translation->translator_helper = 
$prev_helper;
  
!                       if ($xslt)
!                       {
!                               return $data;
!                       }
!                       else
!                       {
!                               $parse_data['msgbox_data'] = $data;
! 
!                               
$GLOBALS['phpgw']->xslttpl->set_var('msgbox',$parse_data);
!                               return $GLOBALS['phpgw']->xslttpl->parse();
!                       }
                }