[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: projects/inc class.boprojects.inc.php,1.42.2.5.2
|
From: |
Bettina Gille <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: projects/inc class.boprojects.inc.php,1.42.2.5.2.9,1.42.2.5.2.10 class.soprojects.inc.php,1.34.2.6.2.8,1.34.2.6.2.9 class.uiprojects.inc.php,1.47.2.7.2.6,1.47.2.7.2.7 |
|
Date: |
Tue, 03 Jun 2003 09:15:18 -0400 |
Update of /cvsroot/phpgroupware/projects/inc
In directory subversions:/tmp/cvs-serv25927/inc
Modified Files:
Tag: Version-0_9_16-branch
class.boprojects.inc.php class.soprojects.inc.php
class.uiprojects.inc.php
Log Message:
update
Index: class.boprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.boprojects.inc.php,v
retrieving revision 1.42.2.5.2.9
retrieving revision 1.42.2.5.2.10
diff -C2 -r1.42.2.5.2.9 -r1.42.2.5.2.10
*** class.boprojects.inc.php 2 Jun 2003 23:22:50 -0000 1.42.2.5.2.9
--- class.boprojects.inc.php 3 Jun 2003 13:15:14 -0000 1.42.2.5.2.10
***************
*** 382,389 ****
$pro['utime'] =
$this->sohours->get_time_used($project_id);
! $pro['phours'] = floor($pro['ptime']/60);
! $pro['pminutes'] =
$pro['ptime']-(floor($pro['ptime']/60)*60);
! $pro['uhours'] = floor($pro['utime']/60);
! $pro['uminutes'] =
$pro['utime']-(floor($pro['utime']/60)*60);
if ($pro['edate'] == 0)
--- 382,389 ----
$pro['utime'] =
$this->sohours->get_time_used($project_id);
! $pro['phours'] = ($pro['ptime']/60);
! //$pro['pminutes'] =
$pro['ptime']-(floor($pro['ptime']/60)*60);
! $pro['uhours'] = ($pro['utime']/60);
! //$pro['uminutes'] =
$pro['utime']-(floor($pro['utime']/60)*60);
if ($pro['edate'] == 0)
***************
*** 548,552 ****
$sum_ptime =
$this->so->get_planned_value(array('action' => 'tparent','parent_id' =>
$values['parent']
,'project_id' =>
$values['project_id']));
! if ((intval($values['ptime'])+$sum_ptime) >
$ptime_parent)
{
$error[] = lang('planned time sum of
all sub projects is bigger than the planned time of the main project');
--- 548,554 ----
$sum_ptime =
$this->so->get_planned_value(array('action' => 'tparent','parent_id' =>
$values['parent']
,'project_id' =>
$values['project_id']));
! $pminutes = intval($values['ptime'])*60;
!
! if (($pminutes+$sum_ptime) > $ptime_parent)
{
$error[] = lang('planned time sum of
all sub projects is bigger than the planned time of the main project');
***************
*** 556,560 ****
$sum_budget =
$this->so->get_planned_value(array('action' => 'bparent','parent_id' =>
$values['parent']
,'project_id' =>
$values['project_id']));
! if ($values['budget'])+$sum_budget) >
$budget_parent)
{
$error[] = lang('budget sum of all sub
projects is bigger than the budget of the main project');
--- 558,562 ----
$sum_budget =
$this->so->get_planned_value(array('action' => 'bparent','parent_id' =>
$values['parent']
,'project_id' =>
$values['project_id']));
! if (($values['budget']+$sum_budget) >
$budget_parent)
{
$error[] = lang('budget sum of all sub
projects is bigger than the budget of the main project');
***************
*** 644,648 ****
}
! $values['ptime'] = intval($values['ptime']);
if ($values['smonth'] || $values['sday'] ||
$values['syear'])
--- 646,650 ----
}
! $values['ptime'] = intval($values['ptime'])*60;
if ($values['smonth'] || $values['sday'] ||
$values['syear'])
***************
*** 680,683 ****
--- 682,690 ----
{
$values['number'] =
$this->soprojects->create_activityid();
+ }
+
+ if (!$values['billperae'])
+ {
+ $values['billperae'] = 0;
}
Index: class.soprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.soprojects.inc.php,v
retrieving revision 1.34.2.6.2.8
retrieving revision 1.34.2.6.2.9
diff -C2 -r1.34.2.6.2.8 -r1.34.2.6.2.9
*** class.soprojects.inc.php 2 Jun 2003 23:22:50 -0000 1.34.2.6.2.8
--- class.soprojects.inc.php 3 Jun 2003 13:15:15 -0000 1.34.2.6.2.9
***************
*** 258,265 ****
function add_project($values, $book_activities,
$bill_activities)
{
! $values['owner'] = $this->account;
! $values['descr'] =
$this->db->db_addslashes($values['descr']);
! $values['title'] =
$this->db->db_addslashes($values['title']);
! $values['number'] =
$this->db->db_addslashes($values['number']);
$table = 'phpgw_p_projects';
--- 258,265 ----
function add_project($values, $book_activities,
$bill_activities)
{
! $values['descr'] =
$this->db->db_addslashes($values['descr']);
! $values['title'] =
$this->db->db_addslashes($values['title']);
! $values['number'] =
$this->db->db_addslashes($values['number']);
! $values['investment_nr'] =
$this->db->db_addslashes($values['investment_nr']);
$table = 'phpgw_p_projects';
***************
*** 267,275 ****
$this->db->query('INSERT into phpgw_p_projects
(owner,access,category,entry_date,start_date,end_date,coordinator,customer,status,'
! .
'descr,title,budget,num,parent,time_planned,time_used,date_created,processor)
VALUES (' . $this->account
. ",'" .
$values['access'] . "'," . intval($values['cat']) . ',' . time() . ',' .
intval($values['sdate']) . ','
.
intval($values['edate']) . ',' . intval($values['coordinator']) . ',' .
intval($values['customer']) . ",'" . $values['status']
. "','" .
$values['descr'] . "','" . $values['title'] . "'," . $values['budget'] . ",'" .
$values['number'] . "',"
! .
intval($values['parent']) . ',' . intval($values['ptime']) . ',' . time() . ','
. $this->account . ')',__LINE__,__FILE__);
/*$this->db->query("SELECT max(id) FROM
phpgw_p_projects");
--- 267,276 ----
$this->db->query('INSERT into phpgw_p_projects
(owner,access,category,entry_date,start_date,end_date,coordinator,customer,status,'
! .
'descr,title,budget,num,parent,time_planned,date_created,processor) VALUES (' .
$this->account
. ",'" .
$values['access'] . "'," . intval($values['cat']) . ',' . time() . ',' .
intval($values['sdate']) . ','
.
intval($values['edate']) . ',' . intval($values['coordinator']) . ',' .
intval($values['customer']) . ",'" . $values['status']
. "','" .
$values['descr'] . "','" . $values['title'] . "'," . $values['budget'] . ",'" .
$values['number'] . "',"
! .
intval($values['parent']) . ',' . intval($values['ptime']) . ',' . time() . ','
. $this->account . ",'" . $values['investment_nr']
! .
"')",__LINE__,__FILE__);
/*$this->db->query("SELECT max(id) FROM
phpgw_p_projects");
***************
*** 308,315 ****
function edit_project($values, $book_activities,
$bill_activities)
{
! $values['descr'] =
$this->db->db_addslashes($values['descr']);
! $values['title'] =
$this->db->db_addslashes($values['title']);
! $values['number'] =
$this->db->db_addslashes($values['number']);
! $values['project_id'] = intval($values['project_id']);
$this->db->query("UPDATE phpgw_p_projects set access='"
. $values['access'] . "', category=" . intval($values['cat']) . ", entry_date="
--- 309,317 ----
function edit_project($values, $book_activities,
$bill_activities)
{
! $values['descr'] =
$this->db->db_addslashes($values['descr']);
! $values['title'] =
$this->db->db_addslashes($values['title']);
! $values['number'] =
$this->db->db_addslashes($values['number']);
! $values['investment_nr'] =
$this->db->db_addslashes($values['investment_nr']);
! $values['project_id'] =
intval($values['project_id']);
$this->db->query("UPDATE phpgw_p_projects set access='"
. $values['access'] . "', category=" . intval($values['cat']) . ", entry_date="
***************
*** 317,324 ****
.
intval($values['coordinator']) . ", customer=" . intval($values['customer']) .
", status='" . $values['status'] . "', descr='"
. $values['descr'] .
"', title='" . $values['title'] . "', budget=" . $values['budget'] . ", num='"
! . $values['number'] .
"', time_planned=" . intval($values['ptime']) . ', processor=' . $this->account
! . ' where id=' .
$values['project_id'],__LINE__,__FILE__);
! if (count($book_activities) != 0)
{
$this->db2->query('delete from
phpgw_p_projectactivities where project_id=' . $values['project_id']
--- 319,326 ----
.
intval($values['coordinator']) . ", customer=" . intval($values['customer']) .
", status='" . $values['status'] . "', descr='"
. $values['descr'] .
"', title='" . $values['title'] . "', budget=" . $values['budget'] . ", num='"
! . $values['number'] .
"', time_planned=" . intval($values['ptime']) . ', processor=' . $this->account
. ", investment_nr='"
! .
$values['investment_nr'] . "' where id=" .
$values['project_id'],__LINE__,__FILE__);
! if (is_array($book_activities))
{
$this->db2->query('delete from
phpgw_p_projectactivities where project_id=' . $values['project_id']
***************
*** 332,336 ****
}
! if (count($bill_activities) != 0)
{
$this->db2->query('delete from
phpgw_p_projectactivities where project_id=' . $values['project_id']
--- 334,338 ----
}
! if (is_array($bill_activities))
{
$this->db2->query('delete from
phpgw_p_projectactivities where project_id=' . $values['project_id']
***************
*** 855,860 ****
$this->db->query("insert into phpgw_p_activities
(num,category,descr,remarkreq,billperae,minperae) values ('"
! . $values['number'] .
"'," . $values['cat'] . ",'" . $values['descr'] . "','" . $values['remarkreq']
. "',"
! . $values['billperae']
. ',' . $values['minperae'] . ')',__LINE__,__FILE__);
}
--- 857,862 ----
$this->db->query("insert into phpgw_p_activities
(num,category,descr,remarkreq,billperae,minperae) values ('"
! . $values['number'] .
"'," . intval($values['cat']) . ",'" . $values['descr'] . "','" .
$values['remarkreq'] . "',"
! . $values['billperae']
. ',' . intval($values['minperae']) . ')',__LINE__,__FILE__);
}
***************
*** 864,870 ****
$values['descr'] =
$this->db->db_addslashes($values['descr']);
! $this->db->query("update phpgw_p_activities set num='"
. $values['number'] . "', category=" . $values['cat']
. ",remarkreq='" .
$values['remarkreq'] . "',descr='" . $values['descr'] . "',billperae="
! . $values['billperae']
. ',minperae=' . $values['minperae'] . ' where id=' .
$values['activity_id'],__LINE__,__FILE__);
}
--- 866,872 ----
$values['descr'] =
$this->db->db_addslashes($values['descr']);
! $this->db->query("update phpgw_p_activities set num='"
. $values['number'] . "', category=" . intval($values['cat'])
. ",remarkreq='" .
$values['remarkreq'] . "',descr='" . $values['descr'] . "',billperae="
! . $values['billperae']
. ',minperae=' . intval($values['minperae']) . ' where id=' .
intval($values['activity_id']),__LINE__,__FILE__);
}
Index: class.uiprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uiprojects.inc.php,v
retrieving revision 1.47.2.7.2.6
retrieving revision 1.47.2.7.2.7
diff -C2 -r1.47.2.7.2.6 -r1.47.2.7.2.7
*** class.uiprojects.inc.php 2 Jun 2003 22:11:23 -0000 1.47.2.7.2.6
--- class.uiprojects.inc.php 3 Jun 2003 13:15:15 -0000 1.47.2.7.2.7
***************
*** 205,208 ****
--- 205,210 ----
$pro_parent = get_var('pro_parent',array('POST','GET'));
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . ($pro_parent?lang('list jobs'):lang('list projects'));
+
$this->display_app_header();
***************
*** 210,215 ****
$GLOBALS['phpgw']->template->set_block('projects_list_t','projects_list','list');
- $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . ($pro_parent?lang('list jobs'):lang('list projects'));
-
if (!$action)
{
--- 212,215 ----
***************
*** 477,485 ****
if ($_POST['save'] || $_POST['apply'])
{
! //$this->cat_id =
($values['new_cat']?$values['new_cat']:$this->cat_id);
!
$values['coordinator'] = $_POST['accountid'];
$values['project_id'] = $project_id;
- $values['cat'] = $this->cat_id;
$values['customer'] =
$_POST['abid'];
$values['parent'] = $pro_parent;
--- 477,483 ----
if ($_POST['save'] || $_POST['apply'])
{
! $this->cat_id =
($values['cat']?$values['cat']:'');
$values['coordinator'] = $_POST['accountid'];
$values['project_id'] = $project_id;
$values['customer'] =
$_POST['abid'];
$values['parent'] = $pro_parent;
***************
*** 510,513 ****
--- 508,520 ----
}
+ if ($action == 'mains' || $action == 'amains')
+ {
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . ($project_id?lang('edit project'):lang('add
project'));
+ }
+ else
+ {
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . ($project_id?lang('edit job'):lang('add job'));
+ }
+
$this->display_app_header();
***************
*** 596,599 ****
--- 603,607 ----
$GLOBALS['phpgw']->template->set_var('title',$values['title']);
$GLOBALS['phpgw']->template->set_var('descr',$values['descr']);
+
$GLOBALS['phpgw']->template->set_var('phours',$values['phours']);
$GLOBALS['phpgw']->template->set_var('status_list',$this->status_format($values['status']));
***************
*** 625,630 ****
if ($action == 'mains' || $action == 'amains')
{
- $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . ($project_id?lang('edit project'):lang('add
project'));
-
$cat = '<select name="cat_id"><option
value="">' . lang('None') . '</option>'
.
$this->cats->formatted_list('select','all',$this->cat_id,True) . '</select>';
--- 633,636 ----
***************
*** 651,655 ****
if ($pro_parent && ($action == 'subs' ||
$action == 'asubs'))
{
-
$GLOBALS['phpgw_info']['flags']['app_header'] = lang('projects') . ': ' .
($project_id?lang('edit job'):lang('add job'));
$GLOBALS['phpgw']->template->set_var('lang_choose',($project_id?'':lang('generate
job id ?')));
$parent =
$this->boprojects->read_single_project($pro_parent);
--- 657,660 ----
***************
*** 705,714 ****
);
$this->display_app_header();
$GLOBALS['phpgw']->template->set_file(array('view' =>
'view.tpl'));
- $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . ($pro_parent?lang('view job'):lang('view project'));
-
$nopref = $this->boprojects->check_prefs();
if (is_array($nopref))
--- 710,718 ----
);
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . ($pro_parent?lang('view job'):lang('view project'));
$this->display_app_header();
$GLOBALS['phpgw']->template->set_file(array('view' =>
'view.tpl'));
$nopref = $this->boprojects->check_prefs();
if (is_array($nopref))
***************
*** 782,799 ****
$GLOBALS['phpgw']->template->set_var('currency',$prefs['currency']);
- $phours = $values['phours'];
- if ($values['pminutes'] > 0)
- {
- $phours .= ':' . ($values['pminutes']);
- }
-
$GLOBALS['phpgw']->template->set_var('phours',$phours);
- $uhours = $values['uhours'];
- if ($values['uminutes'] > 0)
- {
- $uhours .= ':' . ($values['uminutes']);
- }
-
$GLOBALS['phpgw']->template->set_var('uhours',$uhours);
--- 786,791 ----
***************
*** 834,839 ****
$pa_id = get_var('pa_id',array('POST','GET'));
- $confirm = get_var('confirm',array('POST'));
-
switch($action)
{
--- 826,829 ----
***************
*** 851,855 ****
);
! if ($confirm)
{
$del = $pa_id;
--- 841,845 ----
);
! if ($_POST['confirm'])
{
$del = $pa_id;
***************
*** 863,867 ****
$this->boprojects->delete_pa($action,
$del, False);
}
! Header('Location: ' .
$GLOBALS['phpgw']->link('/index.php',$link_data));
}
--- 853,857 ----
$this->boprojects->delete_pa($action,
$del, False);
}
!
$GLOBALS['phpgw']->redirect_link('/index.php',$link_data);
}
***************
*** 896,901 ****
function list_activities()
{
! $action = get_var('action',array('POST','GET'));
$this->display_app_header();
--- 886,892 ----
function list_activities()
{
! $action = 'act';
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . lang('list activities');
$this->display_app_header();
***************
*** 919,924 ****
);
- $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . lang('list activities');
-
if (!$this->start)
{
--- 910,913 ----
***************
*** 1008,1013 ****
$GLOBALS['phpgw']->template->set_var('lang_add',lang('Add'));
$GLOBALS['phpgw']->template->set_var('lang_delete',lang('Delete'));
$GLOBALS['phpgw']->template->pfp('out','activities_list_t',True);
- $this->save_sessiondata($action);
// -------------------------------- end Add form declaration
------------------------------
--- 997,1002 ----
$GLOBALS['phpgw']->template->set_var('lang_add',lang('Add'));
$GLOBALS['phpgw']->template->set_var('lang_delete',lang('Delete'));
+ $this->save_sessiondata('act');
$GLOBALS['phpgw']->template->pfp('out','activities_list_t',True);
// -------------------------------- end Add form declaration
------------------------------
***************
*** 1020,1028 ****
$values =
get_var('values',array('POST'));
- if ($values['new_cat'])
- {
- $this->cat_id = $values['new_cat'];
- }
-
$link_data = array
(
--- 1009,1012 ----
***************
*** 1031,1038 ****
);
! if ($values['submit'])
{
! $this->cat_id =
($values['new_cat']?$values['new_cat']:'');
! $values['cat'] = $this->cat_id;
$values['activity_id'] = $activity_id;
--- 1015,1021 ----
);
! if ($_POST['save'])
{
! $this->cat_id =
($values['cat']?$values['cat']:'');
$values['activity_id'] = $activity_id;
***************
*** 1045,1061 ****
{
$this->boprojects->save_activity($values);
! Header('Location: ' .
$GLOBALS['phpgw']->link('/index.php',$link_data));
}
}
$this->display_app_header();
$form = ($activity_id?'edit':'add');
! $GLOBALS['phpgw']->template->set_file(array('activity_'
. $form => 'formactivity.tpl'));
! $GLOBALS['phpgw']->template->set_block('activity_' .
$form,'add','addhandle');
! $GLOBALS['phpgw']->template->set_block('activity_' .
$form,'edit','edithandle');
- $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . ($activity_id?lang('edit activity'):lang('add
activity'));
$GLOBALS['phpgw']->template->set_var('done_url',$GLOBALS['phpgw']->link('/index.php',$link_data));
$GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.edit_activity&activity_id='
. $activity_id));
--- 1028,1047 ----
{
$this->boprojects->save_activity($values);
!
$GLOBALS['phpgw']->redirect_link('/index.php',$link_data);
}
}
+ if($_POST['cancel'])
+ {
+
$GLOBALS['phpgw']->redirect_link('/index.php',$link_data);
+ }
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . ($activity_id?lang('edit activity'):lang('add
activity'));
$this->display_app_header();
$form = ($activity_id?'edit':'add');
!
$GLOBALS['phpgw']->template->set_file(array('edit_activity' =>
'formactivity.tpl'));
$GLOBALS['phpgw']->template->set_var('done_url',$GLOBALS['phpgw']->link('/index.php',$link_data));
$GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.edit_activity&activity_id='
. $activity_id));
***************
*** 1121,1129 ****
$GLOBALS['phpgw']->template->set_var('lang_delete',lang('Delete'));
! $GLOBALS['phpgw']->template->set_var('edithandle','');
! $GLOBALS['phpgw']->template->set_var('addhandle','');
!
! $GLOBALS['phpgw']->template->pfp('out','activity_' .
$form);
! $GLOBALS['phpgw']->template->pfp($form .
'handle',$form);
}
--- 1107,1112 ----
$GLOBALS['phpgw']->template->set_var('lang_delete',lang('Delete'));
! $this->save_sessiondata('act');
! $GLOBALS['phpgw']->template->pfp('out','edit_activity');
}
***************
*** 1131,1135 ****
{
$action = get_var('action',array('POST','GET'));
!
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
--- 1114,1118 ----
{
$action = get_var('action',array('POST','GET'));
! $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . (($action ==
'pad')?lang('administration'):lang('accountancy'));
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
***************
*** 1146,1151 ****
$GLOBALS['phpgw']->template->set_block('admin_list_t','admin_list','list');
- $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . (($action ==
'pad')?lang('administration'):lang('accountancy'));
-
$GLOBALS['phpgw']->template->set_var('search_action',$GLOBALS['phpgw']->link('/index.php',$link_data));
$GLOBALS['phpgw']->template->set_var('search_list',$this->nextmatchs->search(array('query'
=> $this->query)));
--- 1129,1132 ----
***************
*** 1211,1215 ****
{
$action = get_var('action',array('POST','GET'));
- $submit = get_var('submit',array('POST'));
$users = get_var('users',array('POST'));
$groups = get_var('groups',array('POST'));
--- 1192,1195 ----
***************
*** 1221,1231 ****
);
! if ($submit)
{
$this->boprojects->edit_admins($action, $users,
$groups);
$link_data['menuaction'] =
'projects.uiprojects.list_admins';
! Header('Location: ' .
$GLOBALS['phpgw']->link('/index.php',$link_data));
}
!
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
--- 1201,1211 ----
);
! if ($_POST['save'])
{
$this->boprojects->edit_admins($action, $users,
$groups);
$link_data['menuaction'] =
'projects.uiprojects.list_admins';
!
$GLOBALS['phpgw']->redirect_link('/index.php',$link_data);
}
! $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . (($action == 'pad')?lang('edit administrator
list'):lang('edit bookkeeper list'));
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
***************
*** 1235,1240 ****
$GLOBALS['phpgw']->template->set_file(array('admin_add'
=> 'form_admin.tpl'));
- $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . (($action == 'pad')?lang('edit administrator
list'):lang('edit bookkeeper list'));
-
$GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php',$link_data));
--- 1215,1218 ----
***************
*** 1357,1366 ****
function preferences()
{
- $submit = get_var('submit',array('POST'));
$prefs = get_var('prefs',array('POST'));
$abid = get_var('abid',array('POST'));
$oldbill = get_var('oldbill',array('POST'));
! if ($submit)
{
$prefs['abid'] = $abid;
--- 1335,1343 ----
function preferences()
{
$prefs = get_var('prefs',array('POST'));
$abid = get_var('abid',array('POST'));
$oldbill = get_var('oldbill',array('POST'));
! if ($_POST['save'])
{
$prefs['abid'] = $abid;
***************
*** 1370,1375 ****
if ($obill == False)
{
! Header('Location: ' .
$GLOBALS['phpgw']->link('/preferences/index.php'));
! $GLOBALS['phpgw']->common->phpgw_exit();
}
}
--- 1347,1351 ----
if ($obill == False)
{
!
$GLOBALS['phpgw']->redirect_link('/preferences/index.php');
}
}
***************
*** 1516,1519 ****
--- 1492,1496 ----
$pro_parent =
get_var('pro_parent',array('POST','GET'));
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . (($action == 'amains')?lang('project
archive'):lang('job archive'));
$this->display_app_header();
***************
*** 1557,1561 ****
// ------------------------------ end nextmatch template
------------------------------------
- $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . (($action == 'amains')?lang('project
archive'):lang('job archive'));
if ($action == 'amains')
{
--- 1534,1537 ----
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: projects/inc class.boprojects.inc.php,1.42.2.5.2.9,1.42.2.5.2.10 class.soprojects.inc.php,1.34.2.6.2.8,1.34.2.6.2.9 class.uiprojects.inc.php,1.47.2.7.2.6,1.47.2.7.2.7,
Bettina Gille <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: projects/templates/default form.tpl,1.33.4.4,1.33.4.5 form_admin.tpl,1.4,1.4.4.1 formactivity.tpl,1.14.4.1,1.14.4.2 preferences.tpl,1.19.2.2.2.2,1.19.2.2.2.3 view.tpl,1.6.4.2,1.6.4.3
- Next by Date:
[Phpgroupware-cvs] CVS: sitemgr/inc class.Content_SO.inc.php,1.11,1.12
- Previous by thread:
[Phpgroupware-cvs] CVS: projects/templates/default form.tpl,1.33.4.4,1.33.4.5 form_admin.tpl,1.4,1.4.4.1 formactivity.tpl,1.14.4.1,1.14.4.2 preferences.tpl,1.19.2.2.2.2,1.19.2.2.2.3 view.tpl,1.6.4.2,1.6.4.3
- Next by thread:
[Phpgroupware-cvs] CVS: sitemgr/inc class.Content_SO.inc.php,1.11,1.12
- Index(es):