Index: inc/class.boconfig.inc.php =================================================================== RCS file: /cvsroot/phpgroupware/projects/inc/class.boconfig.inc.php,v retrieving revision 1.23 diff -u -r1.23 class.boconfig.inc.php --- inc/class.boconfig.inc.php 8 Apr 2005 15:52:57 -0000 1.23 +++ inc/class.boconfig.inc.php 4 May 2005 13:27:28 -0000 @@ -667,7 +667,7 @@ $workdays = $book_type; // time of booking in this month - $holidays->add_number_of_workdays(1,$now_m,$now_y,$workdays,$country,$federal_state,$religion,&$new_d,&$new_m,&$new_y); + $holidays->add_number_of_workdays(1,$now_m,$now_y,$workdays,$country,$federal_state,$religion,$new_d,$new_m,$new_y); $ts_book = mktime(0,0,0,$new_m,$new_d,$new_y)-1; if($ts_book < $ts_now) @@ -684,7 +684,7 @@ $next_m = $now_m + 1; } - $holidays->add_number_of_workdays(1,$next_m,$next_y,$workdays,$country,$federal_state,$religion,&$new_d,&$new_m,&$new_y); + $holidays->add_number_of_workdays(1,$next_m,$next_y,$workdays,$country,$federal_state,$religion,$new_d,$new_m,$new_y); $ts_book = mktime(0,0,0,$new_m,$new_d,$new_y)-1; } Index: inc/class.boprojects.inc.php =================================================================== RCS file: /cvsroot/phpgroupware/projects/inc/class.boprojects.inc.php,v retrieving revision 1.157 diff -u -r1.157 class.boprojects.inc.php --- inc/class.boprojects.inc.php 8 Apr 2005 15:52:57 -0000 1.157 +++ inc/class.boprojects.inc.php 4 May 2005 13:27:28 -0000 @@ -2900,7 +2900,7 @@ } $workdays = $book_type; - $holidays->add_number_of_workdays(1,$next_m,$next_y,$workdays,$country,$federal_state,$religion,&$new_d,&$new_m,&$new_y); + $holidays->add_number_of_workdays(1,$next_m,$next_y,$workdays,$country,$federal_state,$religion,$new_d,$new_m,$new_y); $ts_book = mktime(0,0,0,$new_m,$new_d,$new_y)-1; // calc book month Index: inc/class.uiconfig.inc.php =================================================================== RCS file: /cvsroot/phpgroupware/projects/inc/class.uiconfig.inc.php,v retrieving revision 1.33 diff -u -r1.33 class.uiconfig.inc.php --- inc/class.uiconfig.inc.php 8 Apr 2005 15:52:58 -0000 1.33 +++ inc/class.uiconfig.inc.php 4 May 2005 13:27:28 -0000 @@ -334,7 +334,7 @@ { for ($i=0;$inextmatchs->template_alternate_row_color(&$GLOBALS['phpgw']->template); + $this->nextmatchs->template_alternate_row_color($GLOBALS['phpgw']->template); $GLOBALS['phpgw']->template->set_var(array ( @@ -559,7 +559,7 @@ for ($i=0;$inextmatchs->template_alternate_row_color(&$GLOBALS['phpgw']->template); + $this->nextmatchs->template_alternate_row_color($GLOBALS['phpgw']->template); $descr = $GLOBALS['phpgw']->strip_html($act[$i]['descr']); if (! $descr) { @@ -775,7 +775,7 @@ for ($i=0;$inextmatchs->template_alternate_row_color(&$GLOBALS['phpgw']->template); + $this->nextmatchs->template_alternate_row_color($GLOBALS['phpgw']->template); if ($admins[$i]['type']=='user') { @@ -924,7 +924,7 @@ { for($i=0;$inextmatchs->template_alternate_row_color(&$GLOBALS['phpgw']->template); + $this->nextmatchs->template_alternate_row_color($GLOBALS['phpgw']->template); $GLOBALS['phpgw']->template->set_var(array ( 'role_name' => $roles[$i]['role_name'], @@ -975,7 +975,7 @@ for ($i=0;$inextmatchs->template_alternate_row_color(&$GLOBALS['phpgw']->template); + $this->nextmatchs->template_alternate_row_color($GLOBALS['phpgw']->template); if($events[$i]['event_type'] == 'limits') { @@ -1068,7 +1068,7 @@ { foreach($charges as $charge) { - $this->nextmatchs->template_alternate_row_color(&$GLOBALS['phpgw']->template); + $this->nextmatchs->template_alternate_row_color($GLOBALS['phpgw']->template); $GLOBALS['phpgw']->template->set_var(array ( Index: inc/class.uiprojecthours.inc.php =================================================================== RCS file: /cvsroot/phpgroupware/projects/inc/class.uiprojecthours.inc.php,v retrieving revision 1.84 diff -u -r1.84 class.uiprojecthours.inc.php --- inc/class.uiprojecthours.inc.php 8 Apr 2005 15:52:58 -0000 1.84 +++ inc/class.uiprojecthours.inc.php 4 May 2005 13:27:28 -0000 @@ -191,7 +191,7 @@ for ($i=0;$inextmatchs->template_alternate_row_color(&$GLOBALS['phpgw']->template); + $this->nextmatchs->template_alternate_row_color($GLOBALS['phpgw']->template); // --------------- template declaration for list records ------------------------------------- @@ -435,7 +435,7 @@ for ($i=0;$inextmatchs->template_alternate_row_color(&$GLOBALS['phpgw']->template); + $this->nextmatchs->template_alternate_row_color($GLOBALS['phpgw']->template); // ---------------- template declaration for list records ------------------------------ @@ -701,7 +701,7 @@ for($i=0;$inextmatchs->template_alternate_row_color(&$GLOBALS['phpgw']->template); + $this->nextmatchs->template_alternate_row_color($GLOBALS['phpgw']->template); // ---------------- template declaration for list records ------------------------------ Index: inc/class.uiprojects.inc.php =================================================================== RCS file: /cvsroot/phpgroupware/projects/inc/class.uiprojects.inc.php,v retrieving revision 1.159 diff -u -r1.159 class.uiprojects.inc.php --- inc/class.uiprojects.inc.php 10 Apr 2005 22:40:36 -0000 1.159 +++ inc/class.uiprojects.inc.php 4 May 2005 13:27:29 -0000 @@ -220,7 +220,7 @@ { foreach($pro as $p) { - $this->nextmatchs->template_alternate_row_color(&$GLOBALS['phpgw']->template); + $this->nextmatchs->template_alternate_row_color($GLOBALS['phpgw']->template); // --------------- template declaration for list records ------------------------------------- @@ -495,7 +495,7 @@ { foreach($pro as $p) { - $this->nextmatchs->template_alternate_row_color(&$GLOBALS['phpgw']->template); + $this->nextmatchs->template_alternate_row_color($GLOBALS['phpgw']->template); // --------------- template declaration for list records ------------------------------------- @@ -664,7 +664,7 @@ for ($i=0;$inextmatchs->template_alternate_row_color(&$this->t); + $this->nextmatchs->template_alternate_row_color($this->t); if ($action == 'mains') { @@ -1086,7 +1086,7 @@ { for($i=0;$inextmatchs->template_alternate_row_color(&$GLOBALS['phpgw']->template); + $this->nextmatchs->template_alternate_row_color($GLOBALS['phpgw']->template); $link_data['s_id'] = $mstones[$i]['s_id']; @@ -1907,7 +1907,7 @@ $upmost_level = $pro[$i]['level']; } - $this->nextmatchs->template_alternate_row_color(&$GLOBALS['phpgw']->template); + $this->nextmatchs->template_alternate_row_color($GLOBALS['phpgw']->template); // --------------- template declaration for list records ------------------------------------- @@ -2087,7 +2087,7 @@ { foreach($roles as $role) { - $this->nextmatchs->template_alternate_row_color(&$GLOBALS['phpgw']->template); + $this->nextmatchs->template_alternate_row_color($GLOBALS['phpgw']->template); $GLOBALS['phpgw']->template->set_var('emp_name',$role['emp_name']); Index: inc/class.uistatistics.inc.php =================================================================== RCS file: /cvsroot/phpgroupware/projects/inc/class.uistatistics.inc.php,v retrieving revision 1.61 diff -u -r1.61 class.uistatistics.inc.php --- inc/class.uistatistics.inc.php 8 Apr 2005 15:52:58 -0000 1.61 +++ inc/class.uistatistics.inc.php 4 May 2005 13:27:29 -0000 @@ -217,7 +217,7 @@ 'admins_included' => True)); } - $this->nextmatchs->template_alternate_row_color(&$GLOBALS['phpgw']->template); + $this->nextmatchs->template_alternate_row_color($GLOBALS['phpgw']->template); //_debug_array($emps); // --------------- template declaration for list records ------------------------------------- @@ -380,7 +380,7 @@ $emps[$pro[$i]['project_id']] = $this->boprojects->selected_employees(array('project_id' => $pro[$i]['project_id'],'roles_included' => True, 'admins_included' => True)); - $this->nextmatchs->template_alternate_row_color(&$GLOBALS['phpgw']->template); + $this->nextmatchs->template_alternate_row_color($GLOBALS['phpgw']->template); // --------------- template declaration for list records ------------------------------------- @@ -544,7 +544,7 @@ $pro[$users[$i]['account_id']] = $this->boprojects->get_employee_projects($users[$i]['account_id']); } - $this->nextmatchs->template_alternate_row_color(&$GLOBALS['phpgw']->template); + $this->nextmatchs->template_alternate_row_color($GLOBALS['phpgw']->template); // --------------------- template declaration for list records --------------------------- @@ -615,7 +615,7 @@ $GLOBALS['phpgw']->template->set_var('employee',$employee); - $this->nextmatchs->alternate_row_color(&$GLOBALS['phpgw']->template); + $this->nextmatchs->alternate_row_color($GLOBALS['phpgw']->template); if (!$values['sdate']) { @@ -662,7 +662,7 @@ while (list($null,$userpro) = each($pro)) { $summin = 0; - $this->nextmatchs->template_alternate_row_color(&$GLOBALS['phpgw']->template); + $this->nextmatchs->template_alternate_row_color($GLOBALS['phpgw']->template); $GLOBALS['phpgw']->template->set_var('e_project',$GLOBALS['phpgw']->strip_html($userpro['title']) . ' [' . $GLOBALS['phpgw']->strip_html($userpro['num']) . ']'); $GLOBALS['phpgw']->template->set_var('e_activity',' '); @@ -695,7 +695,7 @@ $allhours = $this->bostatistics->get_stat_hours('account', $account_id, $project_id ='', $values); $summin=0; - $this->nextmatchs->template_alternate_row_color(&$GLOBALS['phpgw']->template); + $this->nextmatchs->template_alternate_row_color($GLOBALS['phpgw']->template); $GLOBALS['phpgw']->template->set_var('e_project','' . lang('Overall') . ''); $GLOBALS['phpgw']->template->set_var('e_activity',' '); $GLOBALS['phpgw']->template->set_var('e_hours',' '); @@ -715,7 +715,7 @@ } } - $this->nextmatchs->template_alternate_row_color(&$GLOBALS['phpgw']->template); + $this->nextmatchs->template_alternate_row_color($GLOBALS['phpgw']->template); $GLOBALS['phpgw']->template->set_var('e_project','' . lang('Sum') . ''); $GLOBALS['phpgw']->template->set_var('e_activity',' '); $hrs = intval($summin/60) . ':' . sprintf ("%02d",(int)($summin-intval($summin/60)*60)); @@ -1267,7 +1267,7 @@ $project_hj = $this->boprojects->format_minutes($project['sum_minutes_journey']); $project_hs = $this->boprojects->format_minutes($project['sum_minutes_all']); - $this->nextmatchs->template_alternate_row_color(&$GLOBALS['phpgw']->template); + $this->nextmatchs->template_alternate_row_color($GLOBALS['phpgw']->template); $GLOBALS['phpgw']->template->set_var('pro_name', $project['project_title']); $GLOBALS['phpgw']->template->set_var('pro_hours', $project_hw); $GLOBALS['phpgw']->template->set_var('pro_hours_journey', $project_hj);