[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: projects/inc class.boprojecthours.inc.php,1.8,1.
|
From: |
Bettina Gille <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: projects/inc class.boprojecthours.inc.php,1.8,1.9 class.boprojects.inc.php,1.48,1.49class.sobilling.inc.php,1.12,1.13 class.sodeliveries.inc.php,1.16,1.17class.soprojects.inc.php,1.39,1.40 class.sostatistics.inc.php,1.7,1.8class.uibilling.inc.php,1.26,1.27 class.uideliveries.inc.php,1.26,1.27class.uiprojecthours.inc.php,1.27,1.28 class.uiprojects.inc.php,1.59,1.60class.uistatistics.inc.php,1.14,1.15 hook_add_def_pref.inc.php,1.3,1.4 hook_admin.inc.php,1.10,1.11 hook_deleteaccount.inc.php,1.2,1.3hook_preferences.inc.php,1.18,1.19 |
|
Date: |
Fri, 18 Apr 2003 19:48:45 -0400 |
Update of /cvsroot/phpgroupware/projects/inc
In directory subversions:/tmp/cvs-serv9726
Modified Files:
class.boprojecthours.inc.php class.boprojects.inc.php
class.sobilling.inc.php class.sodeliveries.inc.php
class.soprojects.inc.php class.sostatistics.inc.php
class.uibilling.inc.php class.uideliveries.inc.php
class.uiprojecthours.inc.php class.uiprojects.inc.php
class.uistatistics.inc.php hook_add_def_pref.inc.php
hook_admin.inc.php hook_deleteaccount.inc.php
hook_preferences.inc.php
Log Message:
update register_globals off
Index: class.boprojecthours.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.boprojecthours.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** class.boprojecthours.inc.php 7 Jan 2002 10:50:42 -0000 1.8
--- class.boprojecthours.inc.php 18 Apr 2003 23:48:41 -0000 1.9
***************
*** 143,152 ****
if (!
checkdate($values['smonth'],$values['sday'],$values['syear']))
{
! $error[] = lang('You have entered a starting
invalid date !');
}
if (!
checkdate($values['emonth'],$values['eday'],$values['eyear']))
{
! $error[] = lang('You have entered an ending
invalid date !');
}
--- 143,152 ----
if (!
checkdate($values['smonth'],$values['sday'],$values['syear']))
{
! $error[] = lang('You have entered an invalid
start date !');
}
if (!
checkdate($values['emonth'],$values['eday'],$values['eyear']))
{
! $error[] = lang('You have entered an invalid
end date !');
}
Index: class.boprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.boprojects.inc.php,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -r1.48 -r1.49
*** class.boprojects.inc.php 18 Aug 2002 23:21:07 -0000 1.48
--- class.boprojects.inc.php 18 Apr 2003 23:48:42 -0000 1.49
***************
*** 148,152 ****
function cached_accounts($account_id)
{
! return
$GLOBALS['phpgw']->accounts->get_account_data($account_id);
}
--- 148,161 ----
function cached_accounts($account_id)
{
! $this->accounts =
CreateObject('phpgwapi.accounts',$account_id);
!
! $this->accounts->read_repository();
!
!
$cached_data[$this->accounts->data['account_id']]['account_id'] =
$this->accounts->data['account_id'];
!
$cached_data[$this->accounts->data['account_id']]['account_lid'] =
$this->accounts->data['account_lid'];
!
$cached_data[$this->accounts->data['account_id']]['firstname'] =
$this->accounts->data['firstname'];
!
$cached_data[$this->accounts->data['account_id']]['lastname'] =
$this->accounts->data['lastname'];
!
! return $cached_data;
}
***************
*** 159,163 ****
'org_name' => 'org_name');
! $entries = $this->contacts->read($start,
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'], $cols,
$query, $qfilter, $sort, $order, $account_id);
$this->total_records = $this->contacts->total_records;
return $entries;
--- 168,172 ----
'org_name' => 'org_name');
! $entries =
$this->contacts->read($start,$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'],
$cols, $query, $qfilter, $sort, $order, $account_id);
$this->total_records = $this->contacts->total_records;
return $entries;
***************
*** 253,256 ****
--- 262,266 ----
$prefs['country'] =
$GLOBALS['phpgw_info']['user']['preferences']['common']['country'];
+
if ($this->isprojectadmin('pad') ||
$this->isprojectadmin('pbo'))
{
***************
*** 460,464 ****
if (!
checkdate($values['smonth'],$values['sday'],$values['syear']))
{
! $error[] = lang('You have entered an
starting invalid date');
}
}
--- 470,474 ----
if (!
checkdate($values['smonth'],$values['sday'],$values['syear']))
{
! $error[] = lang('You have entered an
invalid start date !');
}
}
***************
*** 468,472 ****
if (!
checkdate($values['emonth'],$values['eday'],$values['eyear']))
{
! $error[] = lang('You have entered an
ending invalid date');
}
}
--- 478,482 ----
if (!
checkdate($values['emonth'],$values['eday'],$values['eyear']))
{
! $error[] = lang('You have entered an
invalid end date !');
}
}
Index: class.sobilling.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.sobilling.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
Index: class.sodeliveries.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.sodeliveries.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
Index: class.soprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.soprojects.inc.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -r1.39 -r1.40
*** class.soprojects.inc.php 4 Jun 2002 13:33:19 -0000 1.39
--- class.soprojects.inc.php 18 Apr 2003 23:48:42 -0000 1.40
***************
*** 57,66 ****
case 'wu': $l = lang('per workunit');
break;
case 'h': $l = lang('per hour'); break;
! default : $l = lang('per hour/workunit');
! }
return $l;
}
-
function read_projects($start, $limit = True, $query = '',
$filter = '', $sort = '', $order = '', $status = '', $cat_id = '', $type =
'mains', $pro_parent = '')
{
--- 57,65 ----
case 'wu': $l = lang('per workunit');
break;
case 'h': $l = lang('per hour'); break;
! default: $l = lang('per hour/workunit');
! }
return $l;
}
function read_projects($start, $limit = True, $query = '',
$filter = '', $sort = '', $order = '', $status = '', $cat_id = '', $type =
'mains', $pro_parent = '')
{
***************
*** 97,101 ****
if ($this->isprojectadmin('pad') ||
$this->isbookkeeper('pbo'))
{
! $filtermethod = " ( access != 'private'
OR coordinator ='" . $this->account . "' )";
}
else
--- 96,100 ----
if ($this->isprojectadmin('pad') ||
$this->isbookkeeper('pbo'))
{
! $filtermethod = " ( access != 'private'
OR coordinator = '" . $this->account . "' )";
}
else
***************
*** 255,259 ****
if ($p_id && ($p_id != 0))
{
! if (count($book_activities) != 0)
{
while($activ=each($book_activities))
--- 254,258 ----
if ($p_id && ($p_id != 0))
{
! if (is_array($book_activities))
{
while($activ=each($book_activities))
***************
*** 264,268 ****
}
! if (count($bill_activities) != 0)
{
while($activ=each($bill_activities))
--- 263,267 ----
}
! if (is_array($bill_activities))
{
while($activ=each($bill_activities))
***************
*** 634,638 ****
$this->db->query("DELETE from phpgw_p_projectmembers
WHERE type='" . $aa . "' OR type='" . $ag . "'",__LINE__,__FILE__);
! if (count($users) != 0)
{
while($activ=each($users))
--- 633,637 ----
$this->db->query("DELETE from phpgw_p_projectmembers
WHERE type='" . $aa . "' OR type='" . $ag . "'",__LINE__,__FILE__);
! if (is_array($users))
{
while($activ=each($users))
***************
*** 643,647 ****
}
! if (count($groups) != 0)
{
while($activ=each($groups))
--- 642,646 ----
}
! if (is_array($groups))
{
while($activ=each($groups))
***************
*** 914,919 ****
{
reset($drop_list);
! // _debug_array($drop_list);
! // exit;
$subdelete = " OR parent in (" .
implode(',',$drop_list) . ")";
--- 913,918 ----
{
reset($drop_list);
! // _debug_array($drop_list);
! // exit;
$subdelete = " OR parent in (" .
implode(',',$drop_list) . ")";
Index: class.sostatistics.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.sostatistics.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
Index: class.uibilling.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uibilling.inc.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** class.uibilling.inc.php 13 Oct 2002 22:04:55 -0000 1.26
--- class.uibilling.inc.php 18 Apr 2003 23:48:42 -0000 1.27
***************
*** 7,11 ****
* Written by Bettina Gille address@hidden *
* ----------------------------------------------- *
! * Copyright (C) 2000,2001,2002 Bettina Gille *
* *
* This program is free software; you can redistribute it and/or *
--- 7,11 ----
* Written by Bettina Gille address@hidden *
* ----------------------------------------------- *
! * Copyright (C) 2000 - 2003 Bettina Gille *
* *
[...1129 lines suppressed...]
/* if ($sum == $sum_netto) {
$t->set_var('error_hint',''); }
else { $t->set_var('error_hint',lang('Error in
calculation sum does not match !')); } */
! $GLOBALS['phpgw']->template->set_var('error_hint','');
$tax = $this->format_tax($prefs['tax']);
! $GLOBALS['phpgw']->template->set_var('tax',$tax);
$taxpercent = ($tax/100);
$sum_tax = $sum_netto*$taxpercent;
!
$GLOBALS['phpgw']->template->set_var('sum_netto',sprintf("%01.2f",round($sum_netto,2)));
!
$GLOBALS['phpgw']->template->set_var('sum_tax',sprintf("%01.2f",round($sum_tax,2)));
$sum_sum = $sum_tax + $sum_netto;
!
$GLOBALS['phpgw']->template->set_var('sum_sum',sprintf("%01.2f",round($sum_sum,2)));
! // $GLOBALS['phpgw']->template->set_var('sumaes',$sumaes);
!
$GLOBALS['phpgw']->template->pfp('out','bill_list_t',True);
$GLOBALS['phpgw']->common->phpgw_exit();
}
Index: class.uideliveries.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uideliveries.inc.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** class.uideliveries.inc.php 13 Oct 2002 22:04:55 -0000 1.26
--- class.uideliveries.inc.php 18 Apr 2003 23:48:42 -0000 1.27
***************
*** 7,11 ****
* Written by Bettina Gille address@hidden *
* ----------------------------------------------- *
! * Copyright (C) 2000,2001,2002 Bettina Gille *
* *
* This program is free software; you can redistribute it and/or *
--- 7,11 ----
* Written by Bettina Gille address@hidden *
* ----------------------------------------------- *
! * Copyright (C) 2000 - 2003 Bettina Gille *
* *
[...1061 lines suppressed...]
}
--- 869,886 ----
}
!
$GLOBALS['phpgw']->template->set_var('aes',$aes);
$act_descr =
$GLOBALS['phpgw']->strip_html($note['act_descr']);
if (! $act_descr) { $act_descr =
' '; }
!
$GLOBALS['phpgw']->template->set_var('act_descr',$act_descr);
!
$GLOBALS['phpgw']->template->set_var('billperae',$note['billperae']);
$hours_descr =
$GLOBALS['phpgw']->strip_html($note['hours_descr']);
if (! $hours_descr) { $hours_descr =
' '; }
!
$GLOBALS['phpgw']->template->set_var('hours_descr',$hours_descr);
!
$GLOBALS['phpgw']->template->fp('list','del_list',True);
}
}
! $GLOBALS['phpgw']->template->set_var('sumaes',$sumaes);
!
$GLOBALS['phpgw']->template->pfp('out','del_list_t',True);
$GLOBALS['phpgw']->common->phpgw_exit();
}
Index: class.uiprojecthours.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uiprojecthours.inc.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** class.uiprojecthours.inc.php 24 May 2002 23:54:12 -0000 1.27
--- class.uiprojecthours.inc.php 18 Apr 2003 23:48:42 -0000 1.28
***************
*** 7,11 ****
* Written by Bettina Gille address@hidden *
* ----------------------------------------------- *
! * Copyright (C) 2000,2001,2002 Bettina Gille *
* *
* This program is free software; you can redistribute it and/or *
--- 7,11 ----
* Written by Bettina Gille address@hidden *
* ----------------------------------------------- *
! * Copyright (C) 2000 - 2003 Bettina Gille *
* *
[...965 lines suppressed...]
}
}
--- 835,851 ----
$this->display_app_header();
!
$GLOBALS['phpgw']->template->set_file(array('hours_delete' => 'delete.tpl'));
! $GLOBALS['phpgw']->template->set_var('lang_subs','');
! $GLOBALS['phpgw']->template->set_var('subs', '');
!
$GLOBALS['phpgw']->template->set_var('nolink',$GLOBALS['phpgw']->link('/index.php',$link_data));
!
$GLOBALS['phpgw']->template->set_var('deleteheader',lang('Are you sure you want
to delete this entry ?'));
!
$GLOBALS['phpgw']->template->set_var('lang_no',lang('No'));
!
$GLOBALS['phpgw']->template->set_var('lang_yes',lang('Yes'));
$link_data['menuaction'] =
'projects.uiprojecthours.delete_hours';
!
$GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php',$link_data));
! $GLOBALS['phpgw']->template->pfp('out','hours_delete');
}
}
Index: class.uiprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uiprojects.inc.php,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -r1.59 -r1.60
*** class.uiprojects.inc.php 13 Oct 2002 22:04:55 -0000 1.59
--- class.uiprojects.inc.php 18 Apr 2003 23:48:42 -0000 1.60
***************
*** 7,11 ****
* Written by Bettina Gille address@hidden *
* ----------------------------------------------- *
! * Copyright (C) 2000,2001,2002 Bettina Gille *
* *
* This program is free software; you can redistribute it and/or *
--- 7,11 ----
* Written by Bettina Gille address@hidden *
* ----------------------------------------------- *
! * Copyright (C) 2000 - 2003 Bettina Gille *
* *
[...2542 lines suppressed...]
!
$GLOBALS['phpgw']->template->set_var('lang_delivery_entry',lang('Deliveries'));
}
else
{
!
$GLOBALS['phpgw']->template->set_var('lang_invoice_entry',' ');
!
$GLOBALS['phpgw']->template->set_var('lang_delivery_entry',' ');
}
!
$GLOBALS['phpgw']->template->set_var('stats',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uistatistics.project_stat&project_id='
.
$pro[$i]['project_id']));
!
$GLOBALS['phpgw']->template->set_var('lang_stats_entry',lang('Statistics'));
!
$GLOBALS['phpgw']->template->fp('list','projects_list',True);
}
// ------------------------- end record declaration ------------------------
!
$GLOBALS['phpgw']->template->pfp('out','projects_list_t',True);
$this->save_sessiondata($action);
}
Index: class.uistatistics.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uistatistics.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** class.uistatistics.inc.php 13 Oct 2002 22:04:55 -0000 1.14
--- class.uistatistics.inc.php 18 Apr 2003 23:48:42 -0000 1.15
***************
*** 7,11 ****
* Written by Bettina Gille address@hidden *
* ----------------------------------------------- *
! * Copyright (C) 2000,2001,2002 Bettina Gille *
* *
* This program is free software; you can redistribute it and/or *
--- 7,11 ----
* Written by Bettina Gille address@hidden *
* ----------------------------------------------- *
! * Copyright (C) 2000 - 2003 Bettina Gille *
* *
[...997 lines suppressed...]
!
$GLOBALS['phpgw']->template->set_var('e_account',' ');
!
$GLOBALS['phpgw']->template->set_var('e_activity',$GLOBALS['phpgw']->strip_html($proall['descr'])
. ' ['
. $GLOBALS['phpgw']->strip_html($proall['num']) . ']');
$summin += $proall['min'];
$hrs = floor($proall['min']/60). ':' .
sprintf ("%02d",(int)($proall['min']-floor($proall['min']/60)*60));
!
$GLOBALS['phpgw']->template->set_var('e_hours',$hrs);
!
$GLOBALS['phpgw']->template->fp('list','stat_list',True);
}
}
!
$this->nextmatchs->template_alternate_row_color(&$GLOBALS['phpgw']->template);
! $GLOBALS['phpgw']->template->set_var('e_account','<b>'
. lang('sum') . '</b>');
!
$GLOBALS['phpgw']->template->set_var('e_activity',' ');
$hrs = floor($summin/60). ':' . sprintf
("%02d",(int)($summin-floor($summin/60)*60));
! $GLOBALS['phpgw']->template->set_var('e_hours',$hrs);
!
$GLOBALS['phpgw']->template->fp('list','stat_list',True);
! $GLOBALS['phpgw']->template->pfp('out','project_stat');
}
}
Index: hook_add_def_pref.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/hook_add_def_pref.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
Index: hook_admin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/hook_admin.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** hook_admin.inc.php 3 Nov 2002 01:03:06 -0000 1.10
--- hook_admin.inc.php 18 Apr 2003 23:48:42 -0000 1.11
***************
*** 17,24 ****
'Administration' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_admins&action=pad'),
'Accountancy' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_admins&action=pbo'),
! 'Global Categories' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicategories.index&appname='
. $appname . '&global_cats=True')
);
//Do not modify below this line
! display_section($appname,$file);
}
?>
--- 17,24 ----
'Administration' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_admins&action=pad'),
'Accountancy' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_admins&action=pbo'),
! 'Global Categories' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicategories.index&appname='
. $appname)
);
//Do not modify below this line
! display_section($appname,$appname,$file);
}
?>
Index: hook_deleteaccount.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/hook_deleteaccount.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
Index: hook_preferences.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/hook_preferences.inc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** hook_preferences.inc.php 4 Nov 2002 00:50:18 -0000 1.18
--- hook_preferences.inc.php 18 Apr 2003 23:48:42 -0000 1.19
***************
*** 12,15 ****
--- 12,16 ----
{
+ $title = $appname;
$file = Array
(
***************
*** 18,22 ****
'Edit categories' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=preferences.uicategories.index&cats_app=projects&cats_level=True&global_cats=True')
);
! display_section($appname,$file);
}
?>
--- 19,23 ----
'Edit categories' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=preferences.uicategories.index&cats_app=projects&cats_level=True&global_cats=True')
);
! display_section($appname,$title,$file);
}
?>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: projects/inc class.boprojecthours.inc.php,1.8,1.9 class.boprojects.inc.php,1.48,1.49class.sobilling.inc.php,1.12,1.13 class.sodeliveries.inc.php,1.16,1.17class.soprojects.inc.php,1.39,1.40 class.sostatistics.inc.php,1.7,1.8class.uibilling.inc.php,1.26,1.27 class.uideliveries.inc.php,1.26,1.27class.uiprojecthours.inc.php,1.27,1.28 class.uiprojects.inc.php,1.59,1.60class.uistatistics.inc.php,1.14,1.15 hook_add_def_pref.inc.php,1.3,1.4 hook_admin.inc.php,1.10,1.11 hook_deleteaccount.inc.php,1.2,1.3hook_preferences.inc.php,1.18,1.19,
Bettina Gille <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: filemanager/inc hook_add_def_pref.inc.php,1.4,1.4.4.1 hook_preferences.inc.php,1.6.2.1,1.6.2.1.2.1
- Next by Date:
[Phpgroupware-cvs] CVS: notes/templates/default edit.xsl,1.2,NONE index.xsl,1.2,NONE view.xsl,1.3,NONE
- Previous by thread:
[Phpgroupware-cvs] CVS: filemanager/inc hook_add_def_pref.inc.php,1.4,1.4.4.1 hook_preferences.inc.php,1.6.2.1,1.6.2.1.2.1
- Next by thread:
[Phpgroupware-cvs] CVS: notes/templates/default edit.xsl,1.2,NONE index.xsl,1.2,NONE view.xsl,1.3,NONE
- Index(es):