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

[Dan Kuykendall <address@hidden>]

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

Modified Files:
        class.common.inc.php functions.inc.php 
Log Message:
updated idsociety to new format. works fine for me in normal/tables and frames 
mode

Index: class.common.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.common.inc.php,v
retrieving revision 1.146
retrieving revision 1.147
diff -C2 -r1.146 -r1.147
*** class.common.inc.php        31 May 2002 18:13:07 -0000      1.146
--- class.common.inc.php        31 May 2002 21:22:25 -0000      1.147
***************
*** 716,719 ****
--- 716,727 ----
                        }
  
+ /******** start temporarily code **************************************/
+ /* this just makes sure the template set is updated to the new format */
+ if (address@hidden(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . 
$GLOBALS['phpgw_info']['server']['template_set'].'/parts.inc.php'))
+ {
+       $GLOBALS['phpgw_info']['server']['template_set'] = 'default';
+ }
+ /******** end temporarily code **************************************/
+ 
                        $tpldir         = PHPGW_SERVER_ROOT . '/' . $appname . 
'/templates/' . $GLOBALS['phpgw_info']['server']['template_set'];
                        $tpldir_default = PHPGW_SERVER_ROOT . '/' . $appname . 
'/templates/default';
***************
*** 1276,1280 ****
                function load_preload_images_data()
                {
!                       $GLOBALS['phpgw_info']['flags']['preload_images'][] = 
$GLOBALS['phpgw_info']['navbar']['logout']['icon'];
                        
                        
if(@is_array($GLOBALS['phpgw_info']['flags']['preload_images']))
--- 1284,1288 ----
                function load_preload_images_data()
                {
!                       //$GLOBALS['phpgw_info']['flags']['preload_images'][] = 
$GLOBALS['phpgw_info']['navbar']['logout']['icon'];
                        
                        
if(@is_array($GLOBALS['phpgw_info']['flags']['preload_images']))
***************
*** 1301,1304 ****
--- 1309,1317 ----
                function load_phpgw_body_tags()
                {
+                       $GLOBALS['phpgw_info']['flags']['body_tags']['bgcolor'] 
= $GLOBALS['phpgw_info']['theme']['bg_color'];
+                       $GLOBALS['phpgw_info']['flags']['body_tags']['alink'] = 
$GLOBALS['phpgw_info']['theme']['alink'];
+                       $GLOBALS['phpgw_info']['flags']['body_tags']['link'] = 
$GLOBALS['phpgw_info']['theme']['link'];
+                       $GLOBALS['phpgw_info']['flags']['body_tags']['vlink'] = 
$GLOBALS['phpgw_info']['theme']['vlink'];
+ 
                        
$GLOBALS['phpgw_info']['flags']['body_tags']['marginwidth']='0';
                        
$GLOBALS['phpgw_info']['flags']['body_tags']['marginheight']='0';
***************
*** 1319,1323 ****
                                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);
--- 1332,1339 ----
                                while(list($key,$value) = 
each($GLOBALS['phpgw_info']['flags']['body_tags']))
                                {
!                                       if($value != '')
!                                       {
!                                               $body_tags_string .= " 
$key=\"$value\"";
!                                       }
                                }
                                
$GLOBALS['phpgw']->template->set_var('phpgw_body_tags',$body_tags_string);

Index: functions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/functions.inc.php,v
retrieving revision 1.145
retrieving revision 1.146
diff -C2 -r1.145 -r1.146
*** functions.inc.php   31 May 2002 18:37:18 -0000      1.145
--- functions.inc.php   31 May 2002 21:22:25 -0000      1.146
***************
*** 326,332 ****
                }
  
-               
- /*DELETE ME SOON!!!!*/ 
$GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'] = 
'default'; 
- 
                
/*************************************************************************\
                * A few hacker resistant constants that will be used throught 
the program *
--- 326,329 ----
***************
*** 353,366 ****
                
$GLOBALS['phpgw']->template->set_var('phpgw_top_table_height','0');
                
$GLOBALS['phpgw']->template->set_var('phpgw_top_frame_height','0');
!               
$GLOBALS['phpgw']->template->set_var('phpgw_top_scrolling','NO');
                
$GLOBALS['phpgw']->template->set_var('phpgw_left_table_width','0');
                
$GLOBALS['phpgw']->template->set_var('phpgw_left_frame_width','0');
!               
$GLOBALS['phpgw']->template->set_var('phpgw_left_scrolling','NO');
                
$GLOBALS['phpgw']->template->set_var('phpgw_right_table_width','0');
                
$GLOBALS['phpgw']->template->set_var('phpgw_right_frame_width','0');
!               
$GLOBALS['phpgw']->template->set_var('phpgw_right_scrolling','NO');
                
$GLOBALS['phpgw']->template->set_var('phpgw_bottom_table_height','0');
                
$GLOBALS['phpgw']->template->set_var('phpgw_bottom_frame_height','0');
!               
$GLOBALS['phpgw']->template->set_var('phpgw_bottom_scrolling','NO');
  
                
$GLOBALS['phpgw']->template->set_var('phpgw_head_charset',lang('charset'));
--- 350,363 ----
                
$GLOBALS['phpgw']->template->set_var('phpgw_top_table_height','0');
                
$GLOBALS['phpgw']->template->set_var('phpgw_top_frame_height','0');
!               
$GLOBALS['phpgw']->template->set_var('phpgw_top_scrolling','AUTO');
                
$GLOBALS['phpgw']->template->set_var('phpgw_left_table_width','0');
                
$GLOBALS['phpgw']->template->set_var('phpgw_left_frame_width','0');
!               
$GLOBALS['phpgw']->template->set_var('phpgw_left_scrolling','AUTO');
                
$GLOBALS['phpgw']->template->set_var('phpgw_right_table_width','0');
                
$GLOBALS['phpgw']->template->set_var('phpgw_right_frame_width','0');
!               
$GLOBALS['phpgw']->template->set_var('phpgw_right_scrolling','AUTO');
                
$GLOBALS['phpgw']->template->set_var('phpgw_bottom_table_height','0');
                
$GLOBALS['phpgw']->template->set_var('phpgw_bottom_frame_height','0');
!               
$GLOBALS['phpgw']->template->set_var('phpgw_bottom_scrolling','AUTO');
  
                
$GLOBALS['phpgw']->template->set_var('phpgw_head_charset',lang('charset'));
***************
*** 563,566 ****
--- 560,568 ----
                if(!PHPGW_USE_FRAMES || PHPGW_FRAME_PART == 'body')
                {
+                       /* parse_bodypart() should not output anything. This is 
here for them to set body tags and such */
+                       if(function_exists('parse_bodypart'))
+                       {
+                               parse_bodypart();
+                       }
                        /* Verify that user has rights to the currentapp */
                        $continue_app_data = True;