[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: preferences changepassword.php,1.40,1.41 prefer
From: |
Ralf Becker <address@hidden> |
Subject: |
[Phpgroupware-cvs] CVS: preferences changepassword.php,1.40,1.41 preferences.php,1.30,1.31 |
Date: |
Sun, 20 Apr 2003 16:43:29 -0400 |
Update of /cvsroot/phpgroupware/preferences
In directory subversions:/tmp/cvs-serv4664
Modified Files:
changepassword.php preferences.php
Log Message:
added app_header via $GLOBALS['phpgw_info']['flags']['app_header']
Index: changepassword.php
===================================================================
RCS file: /cvsroot/phpgroupware/preferences/changepassword.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -r1.40 -r1.41
*** changepassword.php 26 Oct 2002 15:22:06 -0000 1.40
--- changepassword.php 20 Apr 2003 20:43:26 -0000 1.41
***************
*** 24,32 ****
$n_passwd_2 = get_var('n_passwd_2',Array('POST'));
! if (! $GLOBALS['phpgw']->acl->check('changepassword', 1))
{
! Header('Location: ' .
$GLOBALS['phpgw']->link('/preferences/index.php/'));
! $GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
! exit;
}
--- 24,30 ----
$n_passwd_2 = get_var('n_passwd_2',Array('POST'));
! if (! $GLOBALS['phpgw']->acl->check('changepassword', 1) ||
$_POST['cancel'])
{
! $GLOBALS['phpgw']->redirect_link('/preferences/index.php');
}
***************
*** 34,41 ****
'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'));
--- 32,39 ----
'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'));
***************
*** 46,50 ****
}
! if(get_var('submit',Array('POST')))
{
if($n_passwd != $n_passwd_2)
--- 44,48 ----
}
! if(get_var('change',Array('POST')))
{
if($n_passwd != $n_passwd_2)
***************
*** 66,70 ****
else
{
-
$o_passwd = $GLOBALS['phpgw_info']['user']['passwd'];
$passwd_changed =
$GLOBALS['phpgw']->auth->change_password($o_passwd, $n_passwd);
--- 64,67 ----
***************
*** 72,76 ****
{
// 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
--- 69,73 ----
{
// This need to be changed to show a different
message based on the result
!
$GLOBALS['phpgw']->redirect_link('/preferences/index.php','cd=38');
}
else
***************
*** 81,85 ****
$GLOBALS['hook_values']['new_passwd'] =
$n_passwd;
$GLOBALS['phpgw']->hooks->process('changepassword');
! Header('Location: ' .
$GLOBALS['phpgw']->link('/preferences/index.php','cd=18'));
}
}
--- 78,82 ----
$GLOBALS['hook_values']['new_passwd'] =
$n_passwd;
$GLOBALS['phpgw']->hooks->process('changepassword');
!
$GLOBALS['phpgw']->redirect_link('/preferences/index.php','cd=18');
}
}
***************
*** 87,90 ****
--- 84,88 ----
else
{
+ $GLOBALS['phpgw_info']['flags']['app_header'] = lang('Change
your password');
$GLOBALS['phpgw']->common->phpgw_header();
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array(
Index: preferences.php
===================================================================
RCS file: /cvsroot/phpgroupware/preferences/preferences.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -r1.30 -r1.31
*** preferences.php 6 Apr 2003 10:35:51 -0000 1.30
--- preferences.php 20 Apr 2003 20:43:26 -0000 1.31
***************
*** 378,389 ****
}
! 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,384 ----
}
! $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();
$t->set_var('action_url',$GLOBALS['phpgw']->link('/preferences/preferences.php','appname='
. $_GET['appname']));
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: preferences changepassword.php,1.40,1.41 preferences.php,1.30,1.31,
Ralf Becker <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: preferences/inc class.uiaclprefs.inc.php,1.12,1.13 class.uicategories.inc.php,1.24,1.25
- Next by Date:
[Phpgroupware-cvs] CVS: preferences/templates/default category_form.tpl,1.14,1.15 changepassword.tpl,1.1,1.2 delete.tpl,1.7,1.8 index.tpl,1.11,1.12 listcats.tpl,1.11,1.12 preferences.tpl,1.6,1.7
- Previous by thread:
[Phpgroupware-cvs] CVS: preferences/inc class.uiaclprefs.inc.php,1.12,1.13 class.uicategories.inc.php,1.24,1.25
- Next by thread:
[Phpgroupware-cvs] CVS: preferences/templates/default category_form.tpl,1.14,1.15 changepassword.tpl,1.1,1.2 delete.tpl,1.7,1.8 index.tpl,1.11,1.12 listcats.tpl,1.11,1.12 preferences.tpl,1.6,1.7
- Index(es):