[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: projects/inc class.soprojects.inc.php, 1.34.2.6.
From: |
Bettina Gille <address@hidden> |
Subject: |
[Phpgroupware-cvs] CVS: projects/inc class.soprojects.inc.php, 1.34.2.6.2.27, 1.34.2.6.2.28 class.uiprojects.inc.php, 1.47.2.7.2.27, 1.47.2.7.2.28 |
Date: |
Mon, 25 Aug 2003 19:53:03 -0400 |
Update of /cvsroot/phpgroupware/projects/inc
In directory subversions:/tmp/cvs-serv21857/inc
Modified Files:
Tag: Version-0_9_16-branch
class.soprojects.inc.php class.uiprojects.inc.php
Log Message:
update
Index: class.soprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.soprojects.inc.php,v
retrieving revision 1.34.2.6.2.27
retrieving revision 1.34.2.6.2.28
diff -C2 -r1.34.2.6.2.27 -r1.34.2.6.2.28
*** class.soprojects.inc.php 24 Aug 2003 22:53:19 -0000 1.34.2.6.2.27
--- class.soprojects.inc.php 25 Aug 2003 23:53:00 -0000 1.34.2.6.2.28
***************
*** 1346,1350 ****
}
! if (in_array($this->account,$members))
{
return True;
--- 1346,1350 ----
}
! if (is_array($members) &&
in_array($this->account,$members))
{
return True;
Index: class.uiprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uiprojects.inc.php,v
retrieving revision 1.47.2.7.2.27
retrieving revision 1.47.2.7.2.28
diff -C2 -r1.47.2.7.2.27 -r1.47.2.7.2.28
*** class.uiprojects.inc.php 23 Aug 2003 01:33:08 -0000 1.47.2.7.2.27
--- class.uiprojects.inc.php 25 Aug 2003 23:53:00 -0000 1.47.2.7.2.28
***************
*** 1499,1511 ****
$prefs = get_var('prefs',array('POST'));
$abid = get_var('abid',array('POST'));
- $oldbill = get_var('oldbill',array('POST'));
if ($_POST['save'])
{
$prefs['abid'] = $abid;
- $prefs['oldbill'] = $oldbill;
$obill = $this->bo->save_prefs($prefs);
! if ($obill == False)
{
$GLOBALS['phpgw']->redirect_link('/preferences/index.php');
--- 1499,1509 ----
$prefs = get_var('prefs',array('POST'));
$abid = get_var('abid',array('POST'));
if ($_POST['save'])
{
$prefs['abid'] = $abid;
$obill = $this->bo->save_prefs($prefs);
! if (!$obill)
{
$GLOBALS['phpgw']->redirect_link('/preferences/index.php');
***************
*** 1513,1530 ****
}
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
! if ($this->bo->isprojectadmin('pbo') ||
$this->bo->isprojectadmin('pad'))
! {
!
$GLOBALS['phpgw']->template->set_file(array('book_prefs' => 'preferences.tpl'));
!
$GLOBALS['phpgw']->template->set_block('book_prefs','book','bookhandle');
!
$GLOBALS['phpgw']->template->set_block('book_prefs','no','nohandle');
! $this->set_app_langs();
! $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . lang('preferences for accountancy');
! if ($obill == True)
{
$GLOBALS['phpgw']->template->set_var('bill_message',lang('Please set the
minutes per workunit for each activity now !'));
--- 1511,1543 ----
}
+ if ($_POST['done'])
+ {
+
$GLOBALS['phpgw']->redirect_link('/preferences/index.php');
+ }
+
+ $link_data = array
+ (
+ 'menuaction' =>
'projects.uiprojects.preferences',
+ );
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . lang('preferences');
+
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
! $GLOBALS['phpgw']->template->set_file(array('prefs' =>
'preferences.tpl'));
!
$GLOBALS['phpgw']->template->set_block('prefs','book','bookhandle');
!
$GLOBALS['phpgw']->template->set_block('prefs','all','allhandle');
! $this->set_app_langs();
!
$GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php',$link_data));
!
$GLOBALS['phpgw']->template->set_var('lang_notification',lang('Would you like
to get informations per email about projects date due'));
! $prefs = $this->bo->read_prefs();
!
$GLOBALS['phpgw']->template->set_var('notif_selected',$prefs['notification']);
! if ($this->bo->isprojectadmin('pbo') ||
$this->bo->isprojectadmin('pad'))
! {
! if ($obill)
{
$GLOBALS['phpgw']->template->set_var('bill_message',lang('Please set the
minutes per workunit for each activity now !'));
***************
*** 1539,1548 ****
$GLOBALS['phpgw']->template->set_var('lang_address',lang('Select own address'));
! $prefs = $this->bo->read_prefs();
- $oldbill = $prefs['bill'];
-
-
$GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.preferences&oldbill='
. $oldbill));
-
$GLOBALS['phpgw']->template->set_var('doneurl',$GLOBALS['phpgw']->link('/preferences/index.php'));
$GLOBALS['phpgw']->template->set_var('addressbook_link',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.abook'));
--- 1552,1557 ----
$GLOBALS['phpgw']->template->set_var('lang_address',lang('Select own address'));
!
$GLOBALS['phpgw']->template->set_var('oldbill',$prefs['bill']);
$GLOBALS['phpgw']->template->set_var('addressbook_link',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.abook'));
***************
*** 1628,1649 ****
$GLOBALS['phpgw']->template->set_var('bookhandle','');
!
$GLOBALS['phpgw']->template->set_var('nohandle','');
!
$GLOBALS['phpgw']->template->pfp('out','book_prefs');
$GLOBALS['phpgw']->template->pfp('bookhandle','book');
}
else
{
-
$GLOBALS['phpgw']->template->set_file(array('no_prefs' => 'preferences.tpl'));
-
$GLOBALS['phpgw']->template->set_block('no_prefs','book','bookhandle');
-
$GLOBALS['phpgw']->template->set_block('no_prefs','no','nohandle');
-
-
$GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/preferences/index.php'));
-
$GLOBALS['phpgw']->template->set_var('lang_action',lang('Project preferences'));
-
$GLOBALS['phpgw']->template->set_var('lang_no_prefs',lang('Sorry, no
preferences to set for you :)'));
-
$GLOBALS['phpgw']->template->set_var('lang_done',lang('Done'));
$GLOBALS['phpgw']->template->set_var('bookhandle','');
!
$GLOBALS['phpgw']->template->set_var('nohandle','');
!
$GLOBALS['phpgw']->template->pfp('out','no_prefs');
!
$GLOBALS['phpgw']->template->pfp('nohandle','no');
}
}
--- 1637,1653 ----
$GLOBALS['phpgw']->template->set_var('bookhandle','');
!
$GLOBALS['phpgw']->template->set_var('allhandle','');
!
! $GLOBALS['phpgw']->template->pfp('out','prefs');
$GLOBALS['phpgw']->template->pfp('bookhandle','book');
+
$GLOBALS['phpgw']->template->pfp('allhandle','all');
}
else
{
$GLOBALS['phpgw']->template->set_var('bookhandle','');
!
$GLOBALS['phpgw']->template->set_var('allhandle','');
!
! $GLOBALS['phpgw']->template->pfp('out','prefs');
!
$GLOBALS['phpgw']->template->pfp('allhandle','all');
}
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: projects/inc class.soprojects.inc.php, 1.34.2.6.2.27, 1.34.2.6.2.28 class.uiprojects.inc.php, 1.47.2.7.2.27, 1.47.2.7.2.28,
Bettina Gille <address@hidden> <=