[Phpgroupware-cvs] CVS: phpgwapi/inc class.common.inc.php,1.145,1.146 functions.inc.php,1.143,1.144

[Dan Kuykendall <address@hidden>]

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

Modified Files:
        class.common.inc.php functions.inc.php 
Log Message:
fixed design to allow for backwards compatibility

Index: class.common.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.common.inc.php,v
retrieving revision 1.145
retrieving revision 1.146
diff -C2 -r1.145 -r1.146
*** class.common.inc.php        31 May 2002 09:25:52 -0000      1.145
--- class.common.inc.php        31 May 2002 18:13:07 -0000      1.146
***************
*** 1331,1335 ****
                function phpgw_header($forceheader = True, $forcenavbar = True)
                {
!                       /* This is no longer used */
                }
  
--- 1331,1345 ----
                function phpgw_header($forceheader = True, $forcenavbar = True)
                {
!                       /* So far I dont have use for $forceheader and 
$forcenavbar */
!                       /* I only allow this to be run once by using the 
constant */
!                       if(!defined('PHPGW_HEADER_RAN'))
!                       {
!                               define('PHPGW_HEADER_RAN',True);
!                               $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_start');
!                       }
                }
  
***************
*** 1389,1397 ****
                                        }
                                        $GLOBALS['phpgw']->db->disconnect();
!                                       $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');
  /*
                                
--- 1399,1404 ----
                                        }
                                        $GLOBALS['phpgw']->db->disconnect();
!                                       $this->phpgw_header();
!                                       
$GLOBALS['phpgw']->template->pfp('out','phpgw_main_end');
  /*
                                

Index: functions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/functions.inc.php,v
retrieving revision 1.143
retrieving revision 1.144
diff -C2 -r1.143 -r1.144
*** functions.inc.php   31 May 2002 10:18:57 -0000      1.143
--- functions.inc.php   31 May 2002 18:13:07 -0000      1.144
***************
*** 397,401 ****
                        define('PHPGW_FRAME_PART','start');
                }
! //$GLOBALS['phpgw_info']['server']['useframes'] = 'always';
                
if(((isset($GLOBALS['phpgw_info']['user']['preferences']['common']['useframes'])
 &&     
                        
$GLOBALS['phpgw_info']['user']['preferences']['common']['useframes'] && 
--- 397,401 ----
                        define('PHPGW_FRAME_PART','start');
                }
! $GLOBALS['phpgw_info']['server']['useframes'] = 'always';
                
if(((isset($GLOBALS['phpgw_info']['user']['preferences']['common']['useframes'])
 &&     
                        
$GLOBALS['phpgw_info']['user']['preferences']['common']['useframes'] && 
***************
*** 415,424 ****
                                
$GLOBALS['phpgw']->template->set_var('phpgw_bottom_link',$GLOBALS['phpgw']->session->link('home.php','framepart=bottom'));
                                
$GLOBALS['phpgw']->template->set_var('phpgw_unupported_link',$GLOBALS['phpgw']->session->link($GLOBALS['HTTP_SERVER_VARS']['SCRIPT_NAME'],'framepart=unsupported'));
!                               
$GLOBALS['phpgw']->template->set_block('phpgw','phpgw_main_frames','phpgw_main');
                        }
                        else
                        {
                                /* if we are using frames and not starting then 
we use the basic block to keep each part in a nice clean html format */
!                               
$GLOBALS['phpgw']->template->set_block('phpgw','phpgw_main_basic','phpgw_main');
                        }
                }
--- 415,426 ----
                                
$GLOBALS['phpgw']->template->set_var('phpgw_bottom_link',$GLOBALS['phpgw']->session->link('home.php','framepart=bottom'));
                                
$GLOBALS['phpgw']->template->set_var('phpgw_unupported_link',$GLOBALS['phpgw']->session->link($GLOBALS['HTTP_SERVER_VARS']['SCRIPT_NAME'],'framepart=unsupported'));
!                               
$GLOBALS['phpgw']->template->set_block('phpgw','phpgw_main_frames_start','phpgw_main_start');
!                               
$GLOBALS['phpgw']->template->set_block('phpgw','phpgw_main_frames_end','phpgw_main_end');
                        }
                        else
                        {
                                /* if we are using frames and not starting then 
we use the basic block to keep each part in a nice clean html format */
!                               
$GLOBALS['phpgw']->template->set_block('phpgw','phpgw_main_basic_start','phpgw_main_start');
!                               
$GLOBALS['phpgw']->template->set_block('phpgw','phpgw_main_basic_end','phpgw_main_end');
                        }
                }
***************
*** 428,432 ****
                        define('PHPGW_USE_FRAMES',False);
                        define('PHPGW_NAVBAR_TARGET','_self');
!                       
$GLOBALS['phpgw']->template->set_block('phpgw','phpgw_main_tables','phpgw_main');
                }
                
$GLOBALS['phpgw']->template->set_var('phpgw_head_target',PHPGW_NAVBAR_TARGET);
--- 430,435 ----
                        define('PHPGW_USE_FRAMES',False);
                        define('PHPGW_NAVBAR_TARGET','_self');
!                       
$GLOBALS['phpgw']->template->set_block('phpgw','phpgw_main_tables_start','phpgw_main_start');
!                       
$GLOBALS['phpgw']->template->set_block('phpgw','phpgw_main_tables_end','phpgw_main_end');
                }
                
$GLOBALS['phpgw']->template->set_var('phpgw_head_target',PHPGW_NAVBAR_TARGET);
***************
*** 581,584 ****
--- 584,593 ----
                        if($continue_app_data)
                        {
+                               /* I want to phase this out over time. App apps 
should put their data into the templates phpgw_body var*/
+                               if 
(address@hidden'phpgw_info']['flags']['noheader'])
+                               {
+                                       
$GLOBALS['phpgw']->common->phpgw_header();
+                               }
+ 
                                
$GLOBALS['phpgw']->template->set_root(PHPGW_APP_TPL);
                                $GLOBALS['phpgw']->template->halt_on_error = 
'report';