[Phpgroupware-cvs] CVS: phpgwapi/inc class.common.inc.php,1.143,1.144 class.phpgw.inc.php,1.45,1.46 class.translation_file.inc.php,1.6,1.7 class.translation_sql.inc.php,1.13,1.14

[Dan Kuykendall <address@hidden>]

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

Modified Files:
        class.common.inc.php class.phpgw.inc.php 
        class.translation_file.inc.php class.translation_sql.inc.php 
Log Message:
updated so that login page will destroy frames, cleaned up various other issues 
like better lang support in msgbox, now langs trailing char can be turned off. 
several other improvements

Index: class.common.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.common.inc.php,v
retrieving revision 1.143
retrieving revision 1.144
diff -C2 -r1.143 -r1.144
*** class.common.inc.php        30 May 2002 21:13:07 -0000      1.143
--- class.common.inc.php        31 May 2002 08:29:19 -0000      1.144
***************
*** 1026,1030 ****
--- 1026,1033 ----
                                        }
  
+                                       $prev_helper = 
$GLOBALS['phpgw']->translation->translator_helper;
+                                       
$GLOBALS['phpgw']->translation->translator_helper = '';
                                        
$GLOBALS['phpgw']->template->set_var('msgbox_text',lang($key));
+                                       
$GLOBALS['phpgw']->translation->translator_helper = $prev_helper;
                                        if ($value == True)
                                        {
***************
*** 1043,1047 ****
                        {
                                
$GLOBALS['phpgw']->template->set_var('msgbox_row_color',$GLOBALS['phpgw_info']['theme']['row_on']);
!                               
$GLOBALS['phpgw']->template->set_var('msgbox_text',lang($text));
                                if ($type == True)
                                {
--- 1046,1052 ----
                        {
                                
$GLOBALS['phpgw']->template->set_var('msgbox_row_color',$GLOBALS['phpgw_info']['theme']['row_on']);
!                               
$GLOBALS['phpgw']->translation->translator_helper = '';
!                               
$GLOBALS['phpgw']->template->set_var('msgbox_text',lang($key));
!                               
$GLOBALS['phpgw']->translation->translator_helper = $prev_helper;
                                if ($type == True)
                                {
***************
*** 1288,1296 ****
                                        }
                                }
!                               $preload_image_string = 
"MM_preloadImages($preload_image_string); ";
!                               
$GLOBALS['phpgw']->template->set_var('phpgw_preload_images',$preload_image_string);
                        }
                }
                
                /*!
                @function phpgw_header
--- 1293,1328 ----
                                        }
                                }
!                               return " 
MM_preloadImages($preload_image_string);";
                        }
+                       return '';
                }
                
+ 
+               function load_phpgw_body_tags()
+               {
+                       
$GLOBALS['phpgw_info']['flags']['body_tags']['marginwidth']='0';
+                       
$GLOBALS['phpgw_info']['flags']['body_tags']['marginheight']='0';
+                       
$GLOBALS['phpgw_info']['flags']['body_tags']['topmargin']='0';
+                       
$GLOBALS['phpgw_info']['flags']['body_tags']['bottommargin']='0';
+                       
$GLOBALS['phpgw_info']['flags']['body_tags']['rightmargin']='0';
+                       
$GLOBALS['phpgw_info']['flags']['body_tags']['leftmargin']='0';
+                       
$GLOBALS['phpgw_info']['flags']['body_tags']['leftmargin']='0';
+                       
$GLOBALS['phpgw_info']['flags']['body_tags']['border']='0';
+ 
+                       $GLOBALS['phpgw_info']['flags']['body_tags']['onLoad'] 
.= $this->load_preload_images_data(); 
+                       
+                       
+                       
if(@is_array($GLOBALS['phpgw_info']['flags']['body_tags']))
+                       {
+                               $body_tags_string = '';
+                               
reset($GLOBALS['phpgw_info']['flags']['body_tags']);
+                               while(list($key,$value) = 
each($GLOBALS['phpgw_info']['flags']['body_tags']))
+                               {
+                                       $body_tags_string .= " $key=\"$value\"";
+                               }
+                               
$GLOBALS['phpgw']->template->set_var('phpgw_body_tags',$body_tags_string);
+                       }
+               }
+ 
                /*!
                @function phpgw_header
***************
*** 1359,1363 ****
                                        $this->msgbox('',False,'phpgw_msgbox');
                                        $this->load_css_data();
!                                       $this->load_preload_images_data();
                                        
$GLOBALS['phpgw']->template->pfp('out','phpgw_main');
  /*
--- 1391,1396 ----
                                        $this->msgbox('',False,'phpgw_msgbox');
                                        $this->load_css_data();
!                                       $this->load_phpgw_body_tags();
!                                       
$GLOBALS['phpgw']->template->set_block('phpgw','phpgw_head_javascript');
                                        
$GLOBALS['phpgw']->template->pfp('out','phpgw_main');
  /*

Index: class.phpgw.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.phpgw.inc.php,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -r1.45 -r1.46
*** class.phpgw.inc.php 30 May 2002 21:13:07 -0000      1.45
--- class.phpgw.inc.php 31 May 2002 08:29:19 -0000      1.46
***************
*** 134,141 ****
                        }
  
- //                    if(@isset($GLOBALS['HTTP_GET_VARS']['framepart']))
- //                    {
- //                            $url .= '" target="_parent"';
- //                    }
                        if ($iis)
                        {
--- 134,137 ----

Index: class.translation_file.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.translation_file.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** class.translation_file.inc.php      21 May 2002 03:03:22 -0000      1.6
--- class.translation_file.inc.php      31 May 2002 08:29:19 -0000      1.7
***************
*** 28,31 ****
--- 28,32 ----
                var $loaded = False;
                var $all_loaded = False;
+               var $translator_helper = '*';
  
                function translation()
***************
*** 67,71 ****
                        }
  
!                       $ret = @isset($this->lang[$_key]) ? $this->lang[$_key] 
: $key . '*';
  
                        $ndx = 1;
--- 68,72 ----
                        }
  
!                       $ret = @isset($this->lang[$_key]) ? $this->lang[$_key] 
: $key . $this->translator_helper;       
  
                        $ndx = 1;

Index: class.translation_sql.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.translation_sql.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** class.translation_sql.inc.php       20 Feb 2002 04:57:49 -0000      1.13
--- class.translation_sql.inc.php       31 May 2002 08:29:19 -0000      1.14
***************
*** 32,35 ****
--- 32,36 ----
                var $currentapp = '';
                var $loaded = False;
+               var $translator_helper = '*';
  
                /*!
***************
*** 105,109 ****
                        }
  
!                       $ret = @isset($this->lang[$_key]) ? $this->lang[$_key] 
: $key . '*';
  
                        $ndx = 1;
--- 106,110 ----
                        }
  
!                       $ret = @isset($this->lang[$_key]) ? $this->lang[$_key] 
: $key . $this->translator_helper;       
  
                        $ndx = 1;