[Phpgroupware-cvs] CVS: preferences changepassword.php,1.32.2.1,1.32.2.1.2.1 preferences.php,1.13.2.8.2.8,1.13.2.8.2.9

[Ralf Becker <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_16-branch
        changepassword.php preferences.php 
Log Message:
updated app-header


Index: changepassword.php
===================================================================
RCS file: /cvsroot/phpgroupware/preferences/changepassword.php,v
retrieving revision 1.32.2.1
retrieving revision 1.32.2.1.2.1
diff -C2 -r1.32.2.1 -r1.32.2.1.2.1
*** changepassword.php  1 May 2002 23:56:13 -0000       1.32.2.1
--- changepassword.php  19 Apr 2003 18:42:40 -0000      1.32.2.1.2.1
***************
*** 21,30 ****
        include('../header.inc.php');
  
!       $n_passwd   = $GLOBALS['HTTP_POST_VARS']['n_passwd'];
!       $n_passwd_2 = $GLOBALS['HTTP_POST_VARS']['n_passwd_2'];
  
!       if (! $GLOBALS['phpgw']->acl->check('changepassword', 1))
        {
!               Header('Location: ' . 
$GLOBALS['phpgw']->link('/preferences/index.php/'));
                $GLOBALS['phpgw']->common->phpgw_exit();
        }
--- 21,30 ----
        include('../header.inc.php');
  
!       $n_passwd   = $_POST['n_passwd'];
!       $n_passwd_2 = $_POST['n_passwd_2'];
  
!       if (! $GLOBALS['phpgw']->acl->check('changepassword', 1) || 
$_POST['cancel'])
        {
!               $GLOBALS['phpgw']->redirect_link('/preferences/index.php');
                $GLOBALS['phpgw']->common->phpgw_exit();
        }
***************
*** 33,40 ****
                'form' => 'changepassword.tpl'
        ));
-       $GLOBALS['phpgw']->template->set_var('lang_changepassword',lang('Change 
your password'));
        $GLOBALS['phpgw']->template->set_var('lang_enter_password',lang('Enter 
your new password'));
        
$GLOBALS['phpgw']->template->set_var('lang_reenter_password',lang('Re-enter 
your password'));
        $GLOBALS['phpgw']->template->set_var('lang_change',lang('Change'));
        
$GLOBALS['phpgw']->template->set_var('form_action',$GLOBALS['phpgw']->link('/preferences/changepassword.php'));
  
--- 33,40 ----
                'form' => 'changepassword.tpl'
        ));
        $GLOBALS['phpgw']->template->set_var('lang_enter_password',lang('Enter 
your new password'));
        
$GLOBALS['phpgw']->template->set_var('lang_reenter_password',lang('Re-enter 
your password'));
        $GLOBALS['phpgw']->template->set_var('lang_change',lang('Change'));
+       $GLOBALS['phpgw']->template->set_var('lang_cancel',lang('Cancel'));
        
$GLOBALS['phpgw']->template->set_var('form_action',$GLOBALS['phpgw']->link('/preferences/changepassword.php'));
  
***************
*** 45,49 ****
        }
  
!       if ($GLOBALS['HTTP_POST_VARS']['submit'])
        {
                if ($n_passwd != $n_passwd_2)
--- 45,49 ----
        }
  
!       if ($_POST['change'])
        {
                if ($n_passwd != $n_passwd_2)
***************
*** 71,75 ****
                {
                        // This need to be changed to show a different message 
based on the result
!                       Header('Location: ' . 
$GLOBALS['phpgw']->link('/preferences/index.php','cd=38'));
                }
                else
--- 71,75 ----
                {
                        // This need to be changed to show a different message 
based on the result
!                       
$GLOBALS['phpgw']->redirect_link('/preferences/index.php','cd=38');
                }
                else
***************
*** 80,88 ****
                        $GLOBALS['hook_values']['new_passwd'] = $n_passwd;
                        $GLOBALS['phpgw']->hooks->process('changepassword');
!                       Header('Location: ' . 
$GLOBALS['phpgw']->link('/preferences/index.php','cd=18'));
                }
        }
        else
        {
                $GLOBALS['phpgw']->common->phpgw_header();
                echo parse_navbar();
--- 80,89 ----
                        $GLOBALS['hook_values']['new_passwd'] = $n_passwd;
                        $GLOBALS['phpgw']->hooks->process('changepassword');
!                       
$GLOBALS['phpgw']->redirect_link('/preferences/index.php','cd=18');
                }
        }
        else
        {
+               $GLOBALS['phpgw_info']['flags']['app_header'] = lang('Change 
your password');
                $GLOBALS['phpgw']->common->phpgw_header();
                echo parse_navbar();

Index: preferences.php
===================================================================
RCS file: /cvsroot/phpgroupware/preferences/preferences.php,v
retrieving revision 1.13.2.8.2.8
retrieving revision 1.13.2.8.2.9
diff -C2 -r1.13.2.8.2.8 -r1.13.2.8.2.9
*** preferences.php     6 Apr 2003 10:32:41 -0000       1.13.2.8.2.8
--- preferences.php     19 Apr 2003 18:42:40 -0000      1.13.2.8.2.9
***************
*** 378,392 ****
        }
  
        $GLOBALS['phpgw']->common->phpgw_header();
        echo parse_navbar();
- 
-       if ($_GET['appname'] == 'preferences')
-       {
-               $t->set_var('lang_title',lang('Preferences'));
-       }
-       else
-       {
-               $t->set_var('lang_title',lang('%1 - 
Preferences',$GLOBALS['phpgw_info']['apps'][$_GET['appname']]['title']));
-       }
  
        
$t->set_var('action_url',$GLOBALS['phpgw']->link('/preferences/preferences.php','appname='
 . $_GET['appname']));
--- 378,385 ----
        }
  
+       $GLOBALS['phpgw_info']['flags']['app_header'] = $_GET['appname'] == 
'preferences' ?
+               lang('Preferences') : lang('%1 - 
Preferences',$GLOBALS['phpgw_info']['apps'][$_GET['appname']]['title']);
        $GLOBALS['phpgw']->common->phpgw_header();
        echo parse_navbar();
  
        
$t->set_var('action_url',$GLOBALS['phpgw']->link('/preferences/preferences.php','appname='
 . $_GET['appname']));