[Phpgroupware-cvs] CVS: preferences changepassword.php,1.39,1.40 index.php,1.26,1.27 preferences.php,1.20,1.21

[Ralf Becker <address@hidden>]

Update of /cvsroot/phpgroupware/preferences
In directory subversions:/tmp/cvs-serv1132

Modified Files:
        changepassword.php index.php preferences.php 
Log Message:
get preferences to send its output through the xslt-framework


Index: changepassword.php
===================================================================
RCS file: /cvsroot/phpgroupware/preferences/changepassword.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -r1.39 -r1.40
*** changepassword.php  28 Sep 2002 20:01:44 -0000      1.39
--- changepassword.php  26 Oct 2002 15:22:06 -0000      1.40
***************
*** 88,92 ****
        {
                $GLOBALS['phpgw']->common->phpgw_header();
!               $GLOBALS['phpgw']->template->pfp('out','form');
        }
  ?>
--- 88,94 ----
        {
                $GLOBALS['phpgw']->common->phpgw_header();
!               $GLOBALS['phpgw']->xslttpl->set_var('phpgw',array(
!                       'body_data' => 
$GLOBALS['phpgw']->template->fp('out','form')
!               ));
        }
  ?>

Index: index.php
===================================================================
RCS file: /cvsroot/phpgroupware/preferences/index.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** index.php   28 Sep 2002 15:20:19 -0000      1.26
--- index.php   26 Oct 2002 15:22:06 -0000      1.27
***************
*** 16,20 ****
        include('../header.inc.php');
  
!       $pref_tpl = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
        $templates = Array
        (
--- 16,20 ----
        include('../header.inc.php');
  
!       $GLOBALS['pref_tpl'] = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
        $templates = Array
        (
***************
*** 22,32 ****
        );
  
!       $pref_tpl->set_file($templates);
  
!       $pref_tpl->set_block('pref','list');
!       $pref_tpl->set_block('pref','app_row');
!       $pref_tpl->set_block('pref','app_row_noicon');
!       $pref_tpl->set_block('pref','link_row');
!       $pref_tpl->set_block('pref','spacer_row');
  
        if ($GLOBALS['phpgw']->acl->check('run',1,'admin'))
--- 22,32 ----
        );
  
!       $GLOBALS['pref_tpl']->set_file($templates);
  
!       $GLOBALS['pref_tpl']->set_block('pref','list');
!       $GLOBALS['pref_tpl']->set_block('pref','app_row');
!       $GLOBALS['pref_tpl']->set_block('pref','app_row_noicon');
!       $GLOBALS['pref_tpl']->set_block('pref','link_row');
!       $GLOBALS['pref_tpl']->set_block('pref','spacer_row');
  
        if ($GLOBALS['phpgw']->acl->check('run',1,'admin'))
***************
*** 75,79 ****
                        case 'forced':  $selected = 2; break;
                }
!               
$pref_tpl->set_var('tabs',$GLOBALS['phpgw']->common->create_tabs($tabs,$selected));
        }
  
--- 75,79 ----
                        case 'forced':  $selected = 2; break;
                }
!               
$GLOBALS['pref_tpl']->set_var('tabs',$GLOBALS['phpgw']->common->create_tabs($tabs,$selected));
        }
  
***************
*** 81,106 ****
        function section_start($name='',$icon='',$appname='')
        {
!               global $pref_tpl;
! 
!               
$pref_tpl->set_var('icon_backcolor',$GLOBALS['phpgw_info']['theme']['row_off']);
! //            
$pref_tpl->set_var('link_backcolor',$GLOBALS['phpgw_info']['theme']['row_off']);
!               $pref_tpl->set_var('a_name',$appname);
!               $pref_tpl->set_var('app_name',lang($name));
!               $pref_tpl->set_var('app_icon',$icon);
                if ($icon)
                {
!                       $pref_tpl->parse('rows','app_row',True);
                }
                else
                {
!                       $pref_tpl->parse('rows','app_row_noicon',True);
!               } 
        }
  
        function section_item($pref_link='',$pref_text='')
        {
!               global $pref_tpl;
! 
!               $pref_tpl->set_var('pref_link',$pref_link);
  
                if (strtolower($pref_text) == 'grant access' && 
$GLOBALS['phpgw_info']['server']['deny_user_grants_access'])
--- 81,102 ----
        function section_start($name='',$icon='',$appname='')
        {
!               
$GLOBALS['pref_tpl']->set_var('icon_backcolor',$GLOBALS['phpgw_info']['theme']['row_off']);
! //            
$GLOBALS['pref_tpl']->set_var('link_backcolor',$GLOBALS['phpgw_info']['theme']['row_off']);
!               $GLOBALS['pref_tpl']->set_var('a_name',$appname);
!               $GLOBALS['pref_tpl']->set_var('app_name',lang($name));
!               $GLOBALS['pref_tpl']->set_var('app_icon',$icon);
                if ($icon)
                {
!                       $GLOBALS['pref_tpl']->parse('rows','app_row',True);
                }
                else
                {
!                       
$GLOBALS['pref_tpl']->parse('rows','app_row_noicon',True);
!               }
        }
  
        function section_item($pref_link='',$pref_text='')
        {
!               $GLOBALS['pref_tpl']->set_var('pref_link',$pref_link);
  
                if (strtolower($pref_text) == 'grant access' && 
$GLOBALS['phpgw_info']['server']['deny_user_grants_access'])
***************
*** 110,124 ****
                else
                {
!                       $pref_tpl->set_var('pref_text',$pref_text);
                }
  
!               $pref_tpl->parse('rows','link_row',True);
!       } 
  
        function section_end()
        {
!               global $pref_tpl;
! 
!               $pref_tpl->parse('rows','spacer_row',True);
        }
  
--- 106,118 ----
                else
                {
!                       $GLOBALS['pref_tpl']->set_var('pref_text',$pref_text);
                }
  
!               $GLOBALS['pref_tpl']->parse('rows','link_row',True);
!       }
  
        function section_end()
        {
!               $GLOBALS['pref_tpl']->parse('rows','spacer_row',True);
        }
  
***************
*** 131,138 ****
                        section_item($url,lang($text));
                }
!               section_end(); 
        }
  
        $GLOBALS['phpgw']->hooks->process('preferences',array('preferences'));
!       $pref_tpl->pfp('out','list');
  ?>
--- 125,134 ----
                        section_item($url,lang($text));
                }
!               section_end();
        }
  
        $GLOBALS['phpgw']->hooks->process('preferences',array('preferences'));
!       $GLOBALS['phpgw']->xslttpl->set_var('phpgw',array(
!               'body_data' => $GLOBALS['pref_tpl']->fp('out','list')
!       ));
  ?>

Index: preferences.php
===================================================================
RCS file: /cvsroot/phpgroupware/preferences/preferences.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** preferences.php     28 Sep 2002 20:01:44 -0000      1.20
--- preferences.php     26 Oct 2002 15:22:06 -0000      1.21
***************
*** 328,330 ****
--- 328,331 ----
                $t->pfp('out','footer');
        }
+       $GLOBALS['phpgw']->common->phpgw_footer();
  ?>