[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: property/inc class.boadmin.inc.php,1.4,1.5 class
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: property/inc class.boadmin.inc.php,1.4,1.5 class.boinvoice.inc.php,1.15,1.16class.bostandard_2.inc.php,1.2,1.3 class.bostandard_3.inc.php,1.1,1.2class.bostandard_entity.inc.php,1.8,1.9 class.boXport.inc.php,1.8,1.9 class.soadmin.inc.php,1.4,1.5 class.sobuilding.inc.php,1.10,1.11class.soinvestment.inc.php,1.11,1.12 class.soinvoice.inc.php,1.20,1.21class.sostandard_2.inc.php,1.16,1.17 class.sostandard_3.inc.php,1.3,1.4class.sostandard_entity.inc.php,1.8,1.9 class.uiadmin.inc.php,1.9,1.10 class.uiapartment.inc.php,1.10,1.11 class.uibuilding.inc.php,1.18,1.19 class.uicategory.inc.php,1.2,1.3 class.uidocument.inc.php,1.7,1.8 class.uidrawing.inc.php,1.17,1.18 class.uientrance.inc.php,1.11,1.12 class.uiequipment.inc.php,1.20,1.21 class.uigab.inc.php,1.3,1.4 class.uiinvestment.inc.php,1.17,1.18 class.uiinvoice.inc.php,1.22,1.23 class.uimeter.inc.php,1.7,1.8 class.uiowner.inc.php,1.3,1.4 class.uipricebook.inc.php,1.13,1.14 class.uiproject.inc.php,1.19,1.20 class.uiproperty.inc.php,1.22,1.23 class.uireport.inc.php,1.3,1.4 class.uirequest.inc.php,1.12,1.13class.uistandard_2.inc.php,1.10,1.11 class.uistandard_3.inc.php,1.9,1.10 class.uistandard_entity.inc.php,1.12,1.13 class.uitemplate.inc.php,1.8,1.9 class.uitts.inc.php,1.25,1.26 class.uiwo_hour.inc.php,1.22,1.23 class.uiworkorder.inc.php,1.19,1.20 class.uiXport.inc.php,1.25,1.26 |
|
Date: |
Wed, 21 May 2003 08:46:43 -0400 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv29607/inc
Modified Files:
class.boadmin.inc.php class.boinvoice.inc.php
class.bostandard_2.inc.php class.bostandard_3.inc.php
class.bostandard_entity.inc.php class.boXport.inc.php
class.soadmin.inc.php class.sobuilding.inc.php
class.soinvestment.inc.php class.soinvoice.inc.php
class.sostandard_2.inc.php class.sostandard_3.inc.php
class.sostandard_entity.inc.php class.uiadmin.inc.php
class.uiapartment.inc.php class.uibuilding.inc.php
class.uicategory.inc.php class.uidocument.inc.php
class.uidrawing.inc.php class.uientrance.inc.php
class.uiequipment.inc.php class.uigab.inc.php
class.uiinvestment.inc.php class.uiinvoice.inc.php
class.uimeter.inc.php class.uiowner.inc.php
class.uipricebook.inc.php class.uiproject.inc.php
class.uiproperty.inc.php class.uireport.inc.php
class.uirequest.inc.php class.uistandard_2.inc.php
class.uistandard_3.inc.php class.uistandard_entity.inc.php
class.uitemplate.inc.php class.uitts.inc.php
class.uiwo_hour.inc.php class.uiworkorder.inc.php
class.uiXport.inc.php
Log Message:
added msgbox for receipts and errors
Index: class.boadmin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.boadmin.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** class.boadmin.inc.php 10 Mar 2003 09:17:09 -0000 1.4
--- class.boadmin.inc.php 21 May 2003 12:46:39 -0000 1.5
***************
*** 179,184 ****
// echo 'rights_cache:<pre>'; print_r($this->acl2->rights_cache); echo
'</pre>';
! $message = lang('permissions are updated!');
! return $message;
}
--- 179,184 ----
// echo 'rights_cache:<pre>'; print_r($this->acl2->rights_cache); echo
'</pre>';
! $receipt['message'][] = array('msg' =>
lang('permissions are updated!'));
! return $receipt;
}
***************
*** 238,242 ****
}
-
function read_fm_id()
{
--- 238,241 ----
***************
*** 248,254 ****
function edit_id($values='')
{
!
! $message = $this->so->edit_id($values);
! return $message;
}
--- 247,251 ----
function edit_id($values='')
{
! return $this->so->edit_id($values);
}
Index: class.boinvoice.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.boinvoice.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** class.boinvoice.inc.php 15 May 2003 18:46:36 -0000 1.15
--- class.boinvoice.inc.php 21 May 2003 12:46:39 -0000 1.16
***************
*** 151,155 ****
function update_invoice($values)
{
- $errorcount = 0;
while($entry=each($values['counter']))
--- 151,154 ----
***************
*** 173,177 ****
if (!($check_count['dima_count'] ==
$values['invoice_count'][$n]))
{
! $error[$errorcount++] =
array('msg'=>lang('Dima is missing from sub invoice in:'). "
".$values['voucher_id'][$n]);
$local_error= true;
}
--- 172,176 ----
if (!($check_count['dima_count'] ==
$values['invoice_count'][$n]))
{
! $receipt['error'][] =
array('msg'=>lang('Dima is missing from sub invoice in:'). "
".$values['voucher_id'][$n]);
$local_error= true;
}
***************
*** 181,185 ****
if
(!($check_count['spbudact_code_count'] == $values['invoice_count'][$n]))
{
! $error[$errorcount++] =
array('msg'=>lang('Budget code is missing from sub invoice in :'). "
".$values['voucher_id'][$n]);
$local_error= true;
}
--- 180,184 ----
if
(!($check_count['spbudact_code_count'] == $values['invoice_count'][$n]))
{
! $receipt['error'][] =
array('msg'=>lang('Budget code is missing from sub invoice in :'). "
".$values['voucher_id'][$n]);
$local_error= true;
}
***************
*** 326,330 ****
// echo $sql.'<br>';
!
$message[$voucher_id]=array('msg' => lang('voucher is updated: ') .
$voucher_id);
}
--- 325,329 ----
// echo $sql.'<br>';
! $receipt['message'][] =
array('msg'=> lang('voucher is updated: ') . $voucher_id);
}
***************
*** 335,344 ****
}
! //_debug_array($error);
! return $receipt=array(
! 'error' => $error,
! 'message' => $message,
! );
}
--- 334,340 ----
}
! //_debug_array($receipt);
! return $receipt;
}
***************
*** 433,437 ****
function update_period($voucher_id='',$period='')
{
! return $message =
$this->so->update_period($voucher_id,$period);
}
--- 429,433 ----
function update_period($voucher_id='',$period='')
{
! return $this->so->update_period($voucher_id,$period);
}
Index: class.bostandard_2.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bostandard_2.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.bostandard_2.inc.php 11 Feb 2003 10:01:57 -0000 1.2
--- class.bostandard_2.inc.php 21 May 2003 12:46:39 -0000 1.3
***************
*** 121,132 ****
{
! $message =
$this->so->edit($standard,$type);
}
}
else
{
! $message = $this->so->add($standard,$type);
}
! return $message;
}
--- 121,132 ----
{
! $receipt =
$this->so->edit($standard,$type);
}
}
else
{
! $receipt = $this->so->add($standard,$type);
}
! return $receipt;
}
Index: class.bostandard_3.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bostandard_3.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** class.bostandard_3.inc.php 12 Dec 2002 18:15:33 -0000 1.1
--- class.bostandard_3.inc.php 21 May 2003 12:46:39 -0000 1.2
***************
*** 111,122 ****
{
! $message =
$this->so->edit($standard,$type);
}
}
else
{
! $message = $this->so->add($standard,$type);
}
! return $message;
}
--- 111,122 ----
{
! $receipt =
$this->so->edit($standard,$type);
}
}
else
{
! $receipt = $this->so->add($standard,$type);
}
! return $receipt;
}
Index: class.bostandard_entity.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bostandard_entity.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** class.bostandard_entity.inc.php 10 May 2003 17:53:44 -0000 1.8
--- class.bostandard_entity.inc.php 21 May 2003 12:46:39 -0000 1.9
***************
*** 113,124 ****
{
! $message =
$this->so->edit($standard,$type);
}
}
else
{
! $message = $this->so->add($standard,$type);
}
! return $message;
}
--- 113,124 ----
{
! $receipt =
$this->so->edit($standard,$type);
}
}
else
{
! $receipt = $this->so->add($standard,$type);
}
! return $receipt;
}
***************
*** 156,167 ****
{
! $message =
$this->so->edit_attrib($attrib,$type);
}
}
else
{
! $message = $this->so->add_attrib($attrib,$type);
}
! return $message;
}
--- 156,167 ----
{
! $receipt =
$this->so->edit_attrib($attrib,$type);
}
}
else
{
! $receipt = $this->so->add_attrib($attrib,$type);
}
! return $receipt;
}
Index: class.boXport.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.boXport.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** class.boXport.inc.php 9 May 2003 09:05:30 -0000 1.8
--- class.boXport.inc.php 21 May 2003 12:46:39 -0000 1.9
***************
*** 65,69 ****
);
if($this->debug) { echo '<br>Save:';
_debug_array($data); }
!
$GLOBALS['phpgw']->session->appsession('session_data',$this->currentapp,$data);
}
}
--- 65,69 ----
);
if($this->debug) { echo '<br>Save:';
_debug_array($data); }
!
$GLOBALS['phpgw']->session->appsession('session_data','export',$data);
}
}
***************
*** 71,75 ****
function read_sessiondata()
{
! $data =
$GLOBALS['phpgw']->session->appsession('session_data',$this->currentapp);
if($this->debug) { echo '<br>Read:';
_debug_array($data); }
--- 71,75 ----
function read_sessiondata()
{
! $data =
$GLOBALS['phpgw']->session->appsession('session_data','export');
if($this->debug) { echo '<br>Read:';
_debug_array($data); }
Index: class.soadmin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soadmin.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** class.soadmin.inc.php 8 Mar 2003 16:51:15 -0000 1.4
--- class.soadmin.inc.php 21 May 2003 12:46:39 -0000 1.5
***************
*** 82,91 ****
}
!
! $message = lang('ID is updated');
! return $message;
!
}
-
}
?>
--- 82,88 ----
}
! $receipt['message'][] = array('msg' => lang('ID is
updated'));
! return $receipt;
}
}
?>
Index: class.sobuilding.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sobuilding.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** class.sobuilding.inc.php 18 May 2003 10:59:14 -0000 1.10
--- class.sobuilding.inc.php 21 May 2003 12:46:39 -0000 1.11
***************
*** 83,87 ****
$query = ereg_replace('"','',$query);
! $querymethod = " AND property_id LIKE
'%$query%' or name LIKE '%$query%'";
}
--- 83,87 ----
$query = ereg_replace('"','',$query);
! $querymethod = " AND fm_building.property_id
LIKE '%$query%' or fm_building.name LIKE '%$query%'";
}
Index: class.soinvestment.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soinvestment.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** class.soinvestment.inc.php 15 May 2003 18:46:36 -0000 1.11
--- class.soinvestment.inc.php 21 May 2003 12:46:39 -0000 1.12
***************
*** 215,221 ****
! $receipt['message'][0]=array('msg' => lang('Investment
added !'));
! $receipt['message'][1]=array('msg' => lang('Entity ID
'). $entity_id);
! $receipt['message'][2]=array('msg' => lang('Investment
ID:'). $next_invest_id);
return $receipt;
}
--- 215,221 ----
! $receipt['message'][]=array('msg' => lang('Investment
added !'));
! $receipt['message'][]=array('msg' => lang('Entity ID
'). $entity_id);
! $receipt['message'][]=array('msg' => lang('Investment
ID:'). $next_invest_id);
return $receipt;
}
***************
*** 303,308 ****
$ids['property_id'] = $building['property_id'];
! $message = lang('Building has been saved');
! return $message;
}
--- 303,308 ----
$ids['property_id'] = $building['property_id'];
! $receipt['message'][] = array('msg' => lang('Building
has been saved'));
! return $receipt;
}
***************
*** 316,321 ****
. "' AND building_id=" .
$building['building_id'],__LINE__,__FILE__);
! $message = lang('Building has been edited');
! return $message;
}
--- 316,321 ----
. "' AND building_id=" .
$building['building_id'],__LINE__,__FILE__);
! $receipt['message'][] = array('msg' => lang('Building
has been edited'));
! return $receipt;
}
Index: class.soinvoice.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soinvoice.inc.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** class.soinvoice.inc.php 15 May 2003 09:08:02 -0000 1.20
--- class.soinvoice.inc.php 21 May 2003 12:46:39 -0000 1.21
***************
*** 512,516 ****
function update_invoice_sub($values)
{
- $errorcount = 0;
$GLOBALS['phpgw']->db->transaction_begin();
--- 512,515 ----
***************
*** 534,538 ****
if ($GLOBALS['phpgw']->db->f(0) == 0)
{
! $error[$errorcount++] =
array('msg'=>lang('This account is not valid:'). " ".$budget_account);
$local_error= true;
}
--- 533,537 ----
if ($GLOBALS['phpgw']->db->f(0) == 0)
{
! $receipt['error'][] =
array('msg'=> lang('This account is not valid:'). " ".$budget_account);
$local_error= true;
}
***************
*** 540,544 ****
else
{
! $error[$errorcount++] =
array('msg'=>lang('Budget account is missing:'));
$local_error= true;
}
--- 539,543 ----
else
{
! $receipt['error'][] =
array('msg'=>lang('Budget account is missing:'));
$local_error= true;
}
***************
*** 555,559 ****
if ($GLOBALS['phpgw']->db->f(0) == 0)
{
! $error[$errorcount++] =
array('msg'=>lang('This Dim D is not valid:'). " ".$dimd);
$local_error= true;
}
--- 554,558 ----
if ($GLOBALS['phpgw']->db->f(0) == 0)
{
! $receipt['error'][] =
array('msg'=>lang('This Dim D is not valid:'). " ".$dimd);
$local_error= true;
}
***************
*** 565,569 ****
{
$dima_field="dima=NULL";
! $error[$errorcount++] =
array('msg'=>lang('Dim A is missing'));
$local_error= true;
}
--- 564,568 ----
{
$dima_field="dima=NULL";
! $receipt['error'][] =
array('msg'=>lang('Dim A is missing'));
$local_error= true;
}
***************
*** 575,579 ****
if ($GLOBALS['phpgw']->db->f(0) == 0)
{
! $error[$errorcount++] =
array('msg'=>lang('This Dim A is not valid:'). " ".$values['dima'][$n]);
$local_error= true;
}
--- 574,578 ----
if ($GLOBALS['phpgw']->db->f(0) == 0)
{
! $receipt['error'][] =
array('msg'=>lang('This Dim A is not valid:'). " ".$values['dima'][$n]);
$local_error= true;
}
***************
*** 601,605 ****
$GLOBALS['phpgw']->db->query("update
fm_ecobilag set $dima_field , $dimd_field, mvakode = '$tax_code',spbudact_code
= '$budget_account' where id='$id'");
! $message =
array('msg'=>lang('Voucher is updated '));
}
--- 600,604 ----
$GLOBALS['phpgw']->db->query("update
fm_ecobilag set $dima_field , $dimd_field, mvakode = '$tax_code',spbudact_code
= '$budget_account' where id='$id'");
! $receipt['message'][] =
array('msg'=>lang('Voucher is updated '));
}
***************
*** 608,616 ****
$GLOBALS['phpgw']->db->transaction_commit();
-
- $receipt= array(
- 'message' => $message,
- 'error' =>$error);
-
return $receipt;
}
--- 607,610 ----
***************
*** 672,677 ****
$this->db->transaction_commit();
! return lang('voucher period is updated');
!
}
--- 666,671 ----
$this->db->transaction_commit();
! $receipt['message'][] = array('msg'=>lang('voucher
period is updated'));
! return $receipt;
}
Index: class.sostandard_2.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sostandard_2.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** class.sostandard_2.inc.php 15 May 2003 09:08:02 -0000 1.16
--- class.sostandard_2.inc.php 21 May 2003 12:46:39 -0000 1.17
***************
*** 89,93 ****
(
'id' => $this->db->f('id'),
! 'descr' =>
$this->db->f('descr')
);
}
--- 89,93 ----
(
'id' => $this->db->f('id'),
! 'descr' => $this->db->f('descr')
);
}
***************
*** 161,166 ****
. "VALUES ('" . $standard['id'] . "','" .
$standard['descr']. "')",__LINE__,__FILE__);
! $message = lang('standard has been saved');
! return $message;
}
--- 161,166 ----
. "VALUES ('" . $standard['id'] . "','" .
$standard['descr']. "')",__LINE__,__FILE__);
! $receipt['message'][] = array('msg' => lang('standard
has been saved'));
! return $receipt;
}
***************
*** 175,180 ****
. "' WHERE id='" .
$standard['id']. "'",__LINE__,__FILE__);
! $message = lang('standard has been edited');
! return $message;
}
--- 175,180 ----
. "' WHERE id='" .
$standard['id']. "'",__LINE__,__FILE__);
! $receipt['message'][] = array('msg' => lang('standard
has been edited'));
! return $receipt;
}
Index: class.sostandard_3.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sostandard_3.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** class.sostandard_3.inc.php 15 May 2003 09:08:02 -0000 1.3
--- class.sostandard_3.inc.php 21 May 2003 12:46:39 -0000 1.4
***************
*** 137,144 ****
. "VALUES ('" . $standard['id'] . "','" .
$standard['num'] . "','" . $standard['descr']. "')",__LINE__,__FILE__);
! $receipt = array(
! 'id' => $standard['id'],
! 'message' => lang('standard has been
saved')
! );
return $receipt;
--- 137,141 ----
. "VALUES ('" . $standard['id'] . "','" .
$standard['num'] . "','" . $standard['descr']. "')",__LINE__,__FILE__);
! $receipt['message'][] = array('msg' => lang('standard
has been saved'));
return $receipt;
***************
*** 156,161 ****
. "' WHERE id='" .
$standard['id']. "'",__LINE__,__FILE__);
! $message = lang('standard has been edited');
! return $message;
}
--- 153,158 ----
. "' WHERE id='" .
$standard['id']. "'",__LINE__,__FILE__);
! $receipt['message'][] = array('msg' =>lang('standard
has been edited'));
! return $receipt;
}
Index: class.sostandard_entity.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sostandard_entity.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** class.sostandard_entity.inc.php 12 May 2003 21:45:32 -0000 1.8
--- class.sostandard_entity.inc.php 21 May 2003 12:46:39 -0000 1.9
***************
*** 151,162 ****
function add($standard,$type)
{
- $errorcount = 0;
if (!$standard['name'])
{
! $error[$errorcount++] = array('msg'=>lang('Name
not entered!'));
}
! if (! $error)
{
$table = $this->select_table($type);
--- 151,161 ----
function add($standard,$type)
{
if (!$standard['name'])
{
! $receipt['error'][] = array('msg'=>lang('Name
not entered!'));
}
! if (!$receipt['error'])
{
$table = $this->select_table($type);
***************
*** 169,183 ****
. "VALUES ('" . $standard['id'] . "','"
. $standard['name'] . "','" . $standard['descr'] . "','" . $standard['prefix'].
"')",__LINE__,__FILE__);
! $receipt = array(
! 'id' => $standard['id'],
! 'message' => lang('standard has
been saved')
! );
}
else
{
! $receipt = array(
! 'error' => $error,
! 'message' => lang('Attribute has
NOT been saved')
! );
}
--- 168,176 ----
. "VALUES ('" . $standard['id'] . "','"
. $standard['name'] . "','" . $standard['descr'] . "','" . $standard['prefix'].
"')",__LINE__,__FILE__);
! $receipt['message'][] = array('msg' =>
lang('standard has been saved'));
}
else
{
! $receipt['error'][] = array('msg'=>
lang('Attribute has NOT been saved'));
}
***************
*** 188,199 ****
function edit($standard,$type)
{
- $errorcount = 0;
if (!$standard['name'])
{
! $error[$errorcount++] = array('msg'=>lang('Name
not entered!'));
}
! if (! $error)
{
$table = $this->select_table($type);
--- 181,191 ----
function edit($standard,$type)
{
if (!$standard['name'])
{
! $receipt['error'][] = array('msg'=>lang('Name
not entered!'));
}
! if (!$receipt['error'])
{
$table = $this->select_table($type);
***************
*** 206,219 ****
! $receipt = array(
! 'message' => lang('Standard has
been edited')
! );
}
else
{
! $receipt = array(
! 'error' => $error,
! 'message' => lang('Standard has
NOT been edited')
! );
}
--- 198,206 ----
! $receipt['message'][] = array('msg'=>
lang('Standard has been edited'));
}
else
{
! $receipt['error'][] = array('msg' =>
lang('Standard has NOT been edited'));
}
***************
*** 326,347 ****
function add_attrib($attrib,$type)
{
- $errorcount = 0;
if (!$attrib['type_id'])
{
! $error[$errorcount++] =
array('msg'=>lang('Entity type not choosen!'));
}
if (!$attrib['datatype'])
{
! $error[$errorcount++] =
array('msg'=>lang('Datatype type not choosen!'));
}
if (!$attrib['name'])
{
! $error[$errorcount++] = array('msg'=>lang('Name
not entered!'));
}
! if (! $error)
{
--- 313,333 ----
function add_attrib($attrib,$type)
{
if (!$attrib['type_id'])
{
! $receipt['error'][] = array('msg'=>lang('Entity
type not choosen!'));
}
if (!$attrib['datatype'])
{
! $receipt['error'][] =
array('msg'=>lang('Datatype type not choosen!'));
}
if (!$attrib['name'])
{
! $receipt['error'][] = array('msg'=>lang('Name
not entered!'));
}
! if (!$receipt['error'])
{
***************
*** 355,362 ****
. "VALUES ('" . $attrib['id'] . "','" .
$attrib['type_id'] . "','" . $attrib['name'] . "','" . $attrib['descr'] . "','"
. $attrib['datatype']. "')",__LINE__,__FILE__);
! $receipt = array(
! 'id' => $attrib['id'],
! 'message' => lang('Attribute has
been saved')
! );
--- 341,345 ----
. "VALUES ('" . $attrib['id'] . "','" .
$attrib['type_id'] . "','" . $attrib['name'] . "','" . $attrib['descr'] . "','"
. $attrib['datatype']. "')",__LINE__,__FILE__);
! $receipt['message'][] = array('msg' =>
lang('Attribute has been saved') );
***************
*** 364,371 ****
else
{
! $receipt = array(
! 'error' => $error,
! 'message' => lang('Attribute has
NOT been saved')
! );
}
return $receipt;
--- 347,351 ----
else
{
! $receipt['error'][] = array('msg' =>
lang('Attribute has NOT been saved'));
}
return $receipt;
***************
*** 375,398 ****
{
- $errorcount = 0;
-
if (!$attrib['type_id'])
{
! $error[$errorcount++] =
array('msg'=>lang('Entity type not choosen!'));
}
if (!$attrib['datatype'])
{
! $error[$errorcount++] =
array('msg'=>lang('Datatype type not choosen!'));
}
if (!$attrib['name'])
{
! $error[$errorcount++] = array('msg'=>lang('Name
not entered!'));
}
! if (! $error)
{
-
$table = $this->select_table_attrib($type);
--- 355,375 ----
{
if (!$attrib['type_id'])
{
! $receipt['error'][] = array('msg'=>lang('Entity
type not choosen!'));
}
if (!$attrib['datatype'])
{
! $receipt['error'][] =
array('msg'=>lang('Datatype type not choosen!'));
}
if (!$attrib['name'])
{
! $receipt['error'][] = array('msg'=>lang('Name
not entered!'));
}
! if (!$receipt['error'])
{
$table = $this->select_table_attrib($type);
***************
*** 404,418 ****
! $receipt = array(
! 'message' => lang('Attribute has
been edited')
! );
}
else
{
! $receipt = array(
! 'error' => $error,
! 'message' => lang('Attribute has
NOT been edited')
! );
}
return $receipt;
--- 381,390 ----
! $receipt['message'][] = array('msg' =>
lang('Attribute has been edited'));
}
else
{
! $receipt['error'][] = array('msg' =>
lang('Attribute has NOT been edited'));
}
return $receipt;
Index: class.uiadmin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiadmin.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** class.uiadmin.inc.php 28 Apr 2003 10:26:44 -0000 1.9
--- class.uiadmin.inc.php 21 May 2003 12:46:39 -0000 1.10
***************
*** 77,81 ****
if($submit)
{
! $message =
$this->bo->set_permission($values,$r_processed);
}
--- 77,81 ----
if($submit)
{
! $receipt =
$this->bo->set_permission($values,$r_processed);
}
***************
*** 158,168 ****
);
$data = array
(
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'done_action'
=> $GLOBALS['phpgw']->link('/admin/index.php'),
'lang_save'
=> lang('save'),
'lang_done'
=> lang('done'),
- 'message'
=> $message,
'processed'
=> $processed,
'location'
=> $this->location,
--- 158,170 ----
);
+ $msgbox_data = $this->bocommon->msgbox_data($receipt);
+
$data = array
(
+ 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'done_action'
=> $GLOBALS['phpgw']->link('/admin/index.php'),
'lang_save'
=> lang('save'),
'lang_done'
=> lang('done'),
'processed'
=> $processed,
'location'
=> $this->location,
***************
*** 204,208 ****
if ($values['select'])
{
! $message = $this->bo->edit_id($values);
}
--- 206,210 ----
if ($values['select'])
{
! $receipt = $this->bo->edit_id($values);
}
***************
*** 229,234 ****
--- 231,239 ----
);
+ $msgbox_data = $this->bocommon->msgbox_data($receipt);
+
$data = array
(
+ 'msgbox_data' =>
$GLOBALS['phpgw']->common->msgbox($msgbox_data),
'form_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiadmin.edit_id'),
'done_action' =>
$GLOBALS['phpgw']->link('/admin/index.php'),
***************
*** 242,246 ****
'lang_value' =>
lang('Value'),
'lang_remark' =>
lang('Remark'),
- 'message' =>
$message,
'id_table_header' =>
$table_header,
'id_values' =>
$content,
--- 247,250 ----
Index: class.uiapartment.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiapartment.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** class.uiapartment.inc.php 18 May 2003 10:59:14 -0000 1.10
--- class.uiapartment.inc.php 21 May 2003 12:46:39 -0000 1.11
***************
*** 370,376 ****
--- 370,378 ----
}
+ $msgbox_data = $this->bocommon->msgbox_data($receipt);
$data = array
(
+ 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
'lang_dateformat'
=> lang(strtolower($dateformat)),
'dateformat_validate' =>
$dateformat_validate,
***************
*** 406,412 ****
'value_street_name'
=> $values['street_name'],
'value_remark'
=> $values['remark'],
- 'error'
=> $receipt['error'],
'error_flag'
=> $error_id,
- 'message'
=> $receipt['message'],
'lang_name_statustext' =>
lang('Enter the name of the apartment'),
'lang_select_street_help' =>
lang('Select the street name'),
--- 408,412 ----
Index: class.uibuilding.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uibuilding.inc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** class.uibuilding.inc.php 18 May 2003 10:59:14 -0000 1.18
--- class.uibuilding.inc.php 21 May 2003 12:46:39 -0000 1.19
***************
*** 339,344 ****
--- 339,347 ----
+ $msgbox_data = $this->bocommon->msgbox_data($receipt);
+
$data = array
(
+ 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
'lang_dateformat'
=> lang(strtolower($dateformat)),
'dateformat_validate' =>
$dateformat_validate,
***************
*** 366,372 ****
'value_access'
=> $values['access'],
'value_remark'
=> $values['remark'],
- 'error'
=> $receipt['error'],
'error_flag'
=> $error_id,
- 'message'
=> $receipt['message'],
'lang_name_statustext' =>
lang('Enter the name of the building'),
'lang_building_id_statustext' => lang('Enter
Building ID'),
--- 369,373 ----
Index: class.uicategory.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uicategory.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.uicategory.inc.php 8 May 2003 10:47:51 -0000 1.2
--- class.uicategory.inc.php 21 May 2003 12:46:39 -0000 1.3
***************
*** 203,208 ****
--- 203,212 ----
);
//_debug_array($link_data);
+
+ $msgbox_data = $this->bocommon->msgbox_data($receipt);
+
$data = array
(
+ 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uicategory.index&type='.$type),
***************
*** 215,220 ****
'value_name'
=> $category['name'],
'value_generaladdress' =>
$category['general_address'],
- 'error'
=> $receipt['error'],
- 'message'
=> $receipt['message'],
'lang_id_categorytext' => lang('Enter the
category ID'),
'lang_descr_categorytext'
=> lang('Enter a description the category'),
--- 219,222 ----
Index: class.uidocument.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uidocument.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** class.uidocument.inc.php 19 May 2003 11:04:36 -0000 1.7
--- class.uidocument.inc.php 21 May 2003 12:46:39 -0000 1.8
***************
*** 347,354 ****
//_debug_array($link_data);
$data = array
(
! 'error'
=> $receipt['error'],
! 'message'
=> $receipt['message'],
'location_data'
=> $location_data,
'link_history'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidocument.list_doc&cat_id='
. $this->cat_id),
--- 347,355 ----
//_debug_array($link_data);
+ $msgbox_data = $this->bocommon->msgbox_data($receipt);
+
$data = array
(
! 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
'location_data'
=> $location_data,
'link_history'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidocument.list_doc&cat_id='
. $this->cat_id),
***************
*** 631,636 ****
--- 632,640 ----
$dateformat= (implode($sep,$dlarr));
+ $msgbox_data = $this->bocommon->msgbox_data($receipt);
+
$data = array
(
+ 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
'vendor_data'
=> $vendor_data,
'record_history'
=> $record_history,
***************
*** 683,688 ****
'lang_version_statustext' =>
lang('Enter document version'),
- 'error'
=> $receipt['error'],
- 'message'
=> $receipt['message'],
'lang_descr_statustext' =>
lang('Enter a description of the document'),
'lang_descr'
=> lang('Description'),
--- 687,690 ----
***************
*** 901,906 ****
'lang_version_statustext' =>
lang('Enter document version'),
- 'error'
=> $receipt['error'],
- 'message'
=> $receipt['message'],
'lang_descr_statustext' =>
lang('Enter a description of the document'),
'lang_descr'
=> lang('Description'),
--- 903,906 ----
Index: class.uidrawing.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uidrawing.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** class.uidrawing.inc.php 15 May 2003 09:08:02 -0000 1.17
--- class.uidrawing.inc.php 21 May 2003 12:46:40 -0000 1.18
***************
*** 412,417 ****
--- 412,420 ----
$dateformat= (implode($sep,$dlarr));
+ $msgbox_data = $this->bocommon->msgbox_data($receipt);
+
$data = array
(
+ 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
'vendor_data'
=> $vendor_data,
'record_history'
=> $record_history,
***************
*** 461,466 ****
'lang_version_statustext' =>
lang('Enter drawing version'),
- 'error'
=> $receipt['error'],
- 'message'
=> $receipt['message'],
'lang_descr_statustext' =>
lang('Enter a description of the drawing'),
'lang_descr'
=> lang('Description'),
--- 464,467 ----
***************
*** 542,547 ****
$GLOBALS['phpgw']->xslttpl->add_file(array('drawing'));
- $this->create_home_dir();
-
if($values)
{
--- 543,546 ----
***************
*** 672,677 ****
'lang_version_statustext' =>
lang('Enter drawing version'),
- 'error'
=> $receipt['error'],
- 'message'
=> $receipt['message'],
'lang_descr_statustext' =>
lang('Enter a description of the drawing'),
'lang_descr'
=> lang('Description'),
--- 671,674 ----
Index: class.uientrance.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uientrance.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** class.uientrance.inc.php 18 May 2003 10:59:14 -0000 1.11
--- class.uientrance.inc.php 21 May 2003 12:46:40 -0000 1.12
***************
*** 347,352 ****
--- 347,355 ----
+ $msgbox_data = $this->bocommon->msgbox_data($receipt);
+
$data = array
(
+ 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
'lang_dateformat'
=> lang(strtolower($dateformat)),
'dateformat_validate' =>
$dateformat_validate,
***************
*** 374,380 ****
'value_access'
=> $values['access'],
'value_remark'
=> $values['remark'],
- 'error'
=> $receipt['error'],
'error_flag'
=> $error_id,
- 'message'
=> $receipt['message'],
'lang_name_statustext' =>
lang('Enter the name of the entrance'),
'lang_entrance_id_statustext' => lang('Enter
entrance ID'),
--- 377,381 ----
Index: class.uiequipment.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiequipment.inc.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** class.uiequipment.inc.php 11 May 2003 15:55:09 -0000 1.20
--- class.uiequipment.inc.php 21 May 2003 12:46:40 -0000 1.21
***************
*** 385,390 ****
--- 385,393 ----
+ $msgbox_data = $this->bocommon->msgbox_data($receipt);
+
$data = array
(
+ 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
'lang_dateformat'
=> lang(strtolower($dateformat)),
'dateformat_validate' =>
$dateformat_validate,
***************
*** 424,430 ****
'value_lifetime'
=> $values['lifetime'],
'cat_text'
=> $cat_text,
- 'error'
=> $receipt['error'],
'error_flag'
=> $error_id,
- 'message'
=> $receipt['message'],
'lang_descr_statustext' =>
lang('Enter a description of the equipment'),
'lang_descr'
=> lang('Description'),
--- 427,431 ----
Index: class.uigab.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uigab.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** class.uigab.inc.php 7 May 2003 11:18:25 -0000 1.3
--- class.uigab.inc.php 21 May 2003 12:46:40 -0000 1.4
***************
*** 458,463 ****
--- 458,466 ----
}
+ $msgbox_data = $this->bocommon->msgbox_data($receipt);
+
$data = array
(
+ 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
'kommune_nr'
=> $kommune_nr,
'gaards_nr'
=> substr($gab_id,4,5),
***************
*** 483,488 ****
'lang_propagate_statustext' =>
lang('check to inherit from this location'),
- 'error'
=> $receipt['error'],
- 'message'
=> $receipt['message'],
'lang_remark_statustext' =>
lang('Enter a remark for this entity'),
'lang_remark'
=> lang('remark'),
--- 486,489 ----
Index: class.uiinvestment.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiinvestment.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** class.uiinvestment.inc.php 15 May 2003 18:46:36 -0000 1.17
--- class.uiinvestment.inc.php 21 May 2003 12:46:40 -0000 1.18
***************
*** 201,208 ****
$data = array
(
! 'error'
=> $receipt['error'],
! 'message'
=> $receipt['message'],
'links'
=> $links,
'lang_search'
=> lang('Search'),
--- 201,209 ----
+ $msgbox_data = $this->bocommon->msgbox_data($receipt);
+
$data = array
(
! 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
'links'
=> $links,
'lang_search'
=> lang('Search'),
***************
*** 404,411 ****
}
$data = array
(
! 'error'
=> $receipt['error'],
! 'message'
=> $receipt['message'],
'entity_id'
=> $entity_id,
'lang_entity_id'
=> lang('Entity Id'),
--- 405,413 ----
}
+ $msgbox_data = $this->bocommon->msgbox_data($receipt);
+
$data = array
(
! 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
'entity_id'
=> $entity_id,
'lang_entity_id'
=> lang('Entity Id'),
***************
*** 519,524 ****
--- 521,529 ----
+ $msgbox_data = $this->bocommon->msgbox_data($receipt);
+
$data = array
(
+ 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
'location_data'
=> $location_data,
'link_calendar_date' =>
'setDateField(document.form.date);top.newWin=window.open('."'.".'/'.$this->currentapp.'/inc/calendar.html'."'".','."'".'cal'."'".','."'dependent=yes,width=210,height=230,screenX=200,screenY=300,titlebar=yes'".')',
***************
*** 570,575 ****
'value_date'
=> $values['date'],
'value_descr'
=> $values['descr'],
- 'error'
=> $receipt['error'],
- 'message'
=> $receipt['message'],
'lang_done_statustext' =>
lang('Back to the list'),
'lang_save_statustext' =>
lang('Save the investment'),
--- 575,578 ----
Index: class.uiinvoice.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiinvoice.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** class.uiinvoice.inc.php 8 May 2003 13:56:29 -0000 1.22
--- class.uiinvoice.inc.php 21 May 2003 12:46:40 -0000 1.23
***************
*** 460,468 ****
$function_msg = lang('list invoice');
}
$data = array
(
'sum'
=> number_format($sum, 2, ',', ' '),
- 'message'
=> $receipt['message'],
- 'error'
=> $receipt['error'],
'overlib_source'
=> './'.$this->currentapp.'/inc/overlib.js',
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
--- 460,470 ----
$function_msg = lang('list invoice');
}
+
+ $msgbox_data = $this->bocommon->msgbox_data($receipt);
+
$data = array
(
+ 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
'sum'
=> number_format($sum, 2, ',', ' '),
'overlib_source'
=> './'.$this->currentapp.'/inc/overlib.js',
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
***************
*** 512,521 ****
if($submit)
{
! $message =
$this->bo->update_period($voucher_id,$period);
! }
! else
! {
! $message = lang('Edit period');
}
$link_data = array
(
--- 514,522 ----
if($submit)
{
! $receipt =
$this->bo->update_period($voucher_id,$period);
}
+
+ $function_msg = lang('Edit period');
+
$link_data = array
(
***************
*** 524,531 ****
$data = array
(
'period_list'
=> $this->bo->period_list($period),
! 'message'
=> $message,
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'lang_save'
=> lang('save'),
--- 525,535 ----
+ $msgbox_data = $this->bocommon->msgbox_data($receipt);
+
$data = array
(
+ 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
'period_list'
=> $this->bo->period_list($period),
! 'function_msg'
=> $function_msg,
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'lang_save'
=> lang('save'),
Index: class.uimeter.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uimeter.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** class.uimeter.inc.php 15 May 2003 11:18:21 -0000 1.7
--- class.uimeter.inc.php 21 May 2003 12:46:40 -0000 1.8
***************
*** 281,286 ****
--- 281,289 ----
+ $msgbox_data = $this->bocommon->msgbox_data($receipt);
+
$data = array
(
+ 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
'location_data'
=> $location_data,
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
***************
*** 296,301 ****
'value_name'
=> $values['name'],
'value_remark'
=> $values['remark'],
- 'message'
=> $receipt['message'],
- 'error'
=> $receipt['error'],
'lang_meter_id_statustext' =>
lang('Enter the meter ID'),
'lang_name_statustext' =>
lang('Enter the name of the meter'),
--- 299,302 ----
***************
*** 409,414 ****
'value_name'
=> $values['name'],
'value_remark'
=> $values['remark'],
- 'message'
=> $receipt['message'],
- 'error'
=> $receipt['error'],
'cat_list'
=> $this->bo->get_category_list('',$this->cat_id),
);
--- 410,413 ----
Index: class.uiowner.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiowner.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** class.uiowner.inc.php 20 May 2003 18:42:58 -0000 1.3
--- class.uiowner.inc.php 21 May 2003 12:46:40 -0000 1.4
***************
*** 214,218 ****
$values = get_var('values',array('POST'));
!
$GLOBALS['phpgw']->xslttpl->add_file(array('owner','receipt'));
if (is_array($values))
--- 214,218 ----
$values = get_var('values',array('POST'));
! $GLOBALS['phpgw']->xslttpl->add_file(array('owner'));
if (is_array($values))
Index: class.uipricebook.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uipricebook.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** class.uipricebook.inc.php 19 May 2003 11:04:36 -0000 1.13
--- class.uipricebook.inc.php 21 May 2003 12:46:40 -0000 1.14
***************
*** 202,209 ****
}
$data = array
(
! 'error'
=> $receipt['error'],
! 'message'
=> $receipt['message'],
'links'
=> $links,
'allrows'
=> $this->allrows,
--- 202,210 ----
}
+ $msgbox_data = $this->bocommon->msgbox_data($receipt);
+
$data = array
(
! 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
'links'
=> $links,
'allrows'
=> $this->allrows,
***************
*** 319,324 ****
$data = array
(
- 'error'
=> $receipt['error'],
- 'message'
=> $receipt['message'],
'links'
=> $links,
'allrows'
=> $this->allrows,
--- 320,323 ----
***************
*** 347,351 ****
'values_agreement'
=> $content,
'table_add'
=> $table_add,
! 'update_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.agreement')
);
$appname
= lang('pricebook');
--- 346,351 ----
'values_agreement'
=> $content,
'table_add'
=> $table_add,
! 'update_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.agreement')
! );
$appname
= lang('pricebook');
***************
*** 451,456 ****
--- 451,459 ----
);
+ $msgbox_data = $this->bocommon->msgbox_data($receipt);
+
$data = array
(
+ 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.agreement'),
***************
*** 468,473 ****
'value_num'
=> $values['num'],
'value_descr'
=> $values['descr'],
- 'error'
=> $receipt['error'],
- 'message'
=> $receipt['message'],
'lang_num_statustext' =>
lang('A unique code for this activity'),
'lang_done_statustext' =>
lang('Back to the list'),
--- 471,474 ----
***************
*** 650,661 ****
$activity =
$this->bo->read_single_activity($activity_id);
$data = array
(
'done_action'
=> $referer,
'lang_done'
=> lang('done'),
'lang_done_statustext' =>
lang('Back to the list'),
- 'error'
=> $receipt['error'],
- 'message'
=> $receipt['message'],
'links'
=> $links,
'allrows'
=> $this->allrows,
--- 651,663 ----
$activity =
$this->bo->read_single_activity($activity_id);
+ $msgbox_data = $this->bocommon->msgbox_data($receipt);
+
$data = array
(
+ 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
'done_action'
=> $referer,
'lang_done'
=> lang('done'),
'lang_done_statustext' =>
lang('Back to the list'),
'links'
=> $links,
'allrows'
=> $this->allrows,
***************
*** 780,785 ****
$data = array
(
- 'error'
=> $receipt['error'],
- 'message'
=> $receipt['message'],
'links'
=> $links,
'allrows'
=> $this->allrows,
--- 782,785 ----
***************
*** 907,918 ****
}
$data = array
(
! 'error'
=> $receipt['error'],
! 'message'
=> $receipt['message'],
'activity_id'
=> $activity_id,
'vendor_data'
=> $vendor_data,
- 'error'
=> $receipt['error'],
- 'message'
=> $receipt['message'],
'links'
=> $links,
'allrows'
=> $this->allrows,
--- 907,917 ----
}
+ $msgbox_data = $this->bocommon->msgbox_data($receipt);
+
$data = array
(
! 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
'activity_id'
=> $activity_id,
'vendor_data'
=> $vendor_data,
'links'
=> $links,
'allrows'
=> $this->allrows,
***************
*** 1044,1049 ****
--- 1043,1051 ----
);
+ $msgbox_data = $this->bocommon->msgbox_data($receipt);
+
$data = array
(
+ 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.activity&cat_id='
. $values['cat_id']),
***************
*** 1062,1067 ****
'value_descr'
=> $values['descr'],
'value_base_descr'
=> $values['base_descr'],
- 'error'
=> $receipt['error'],
- 'message'
=> $receipt['message'],
'lang_num_statustext' =>
lang('A unique code for this activity'),
'lang_done_statustext' =>
lang('Back to the list'),
--- 1064,1067 ----
Index: class.uiproject.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiproject.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** class.uiproject.inc.php 19 May 2003 11:04:36 -0000 1.19
--- class.uiproject.inc.php 21 May 2003 12:46:40 -0000 1.20
***************
*** 458,463 ****
--- 458,466 ----
+ $msgbox_data = $this->bocommon->msgbox_data($receipt);
+
$data = array
(
+ 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
'lang_origin'
=> lang('origin'),
'lang_origin_statustext' =>
lang('Link to the origin for this project'),
***************
*** 528,533 ****
'value_other_branch'
=> $values['other_branch'],
- 'error'
=> $receipt['error'],
- 'message'
=> $receipt['message'],
'lang_descr_statustext' =>
lang('Enter a description of the project'),
'lang_descr'
=> lang('Description'),
--- 531,534 ----
Index: class.uiproperty.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiproperty.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** class.uiproperty.inc.php 18 May 2003 10:59:14 -0000 1.22
--- class.uiproperty.inc.php 21 May 2003 12:46:40 -0000 1.23
***************
*** 290,295 ****
--- 290,298 ----
+ $msgbox_data = $this->bocommon->msgbox_data($receipt);
+
$data = array
(
+ 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
'lang_dateformat'
=> lang(strtolower($dateformat)),
'dateformat_validate' =>
$dateformat_validate,
***************
*** 315,320 ****
'value_access'
=> $property['access'],
'value_cat'
=> $property['cat'],
- 'message'
=> $receipt['message'],
- 'error'
=> $receipt['error'],
'lang_property_id_statustext' => lang('Enter
the Property ID'),
'lang_name_statustext' =>
lang('Enter the name of the property'),
--- 318,321 ----
Index: class.uireport.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uireport.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** class.uireport.inc.php 17 May 2003 17:49:03 -0000 1.3
--- class.uireport.inc.php 21 May 2003 12:46:40 -0000 1.4
***************
*** 478,483 ****
--- 478,486 ----
+ $msgbox_data = $this->bocommon->msgbox_data($receipt);
+
$data = array
(
+ 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
'property_id'
=> $values['property_id'],
'link_view_file'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uireport.view_file&property_id='
. $values['property_id'] . '&report_id=' . $id),
***************
*** 522,528 ****
'cat_text'
=> $cat_text,
- 'error'
=> $receipt['error'],
'error_flag'
=> $error_id,
- 'message'
=> $receipt['message'],
'lang_abstract_statustext' =>
lang('Enter the abstract of the report'),
'lang_abstract'
=> lang('Abstract'),
--- 525,529 ----
Index: class.uirequest.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uirequest.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** class.uirequest.inc.php 13 May 2003 11:03:06 -0000 1.12
--- class.uirequest.inc.php 21 May 2003 12:46:40 -0000 1.13
***************
*** 263,272 ****
if($values['update'])
{
! $message =
$this->bo->update_priority_key($values);
! }
! else
! {
! $message = lang('Edit priority key');
}
$link_data = array
(
--- 263,270 ----
if($values['update'])
{
! $receipt =
$this->bo->update_priority_key($values);
}
+
+ $function_msg = lang('Edit priority key');
$link_data = array
(
***************
*** 275,282 ****
$priority_key = $this->bo->read_priority_key();
$data = array
(
! 'message'
=> $message,
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'lang_safety'
=> lang('safety'),
--- 273,282 ----
$priority_key = $this->bo->read_priority_key();
+ $msgbox_data = $this->bocommon->msgbox_data($receipt);
$data = array
(
! 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
! 'function_msg'
=> $function_msg,
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'lang_safety'
=> lang('safety'),
***************
*** 563,568 ****
--- 563,571 ----
+ $msgbox_data = $this->bocommon->msgbox_data($receipt);
+
$data = array
(
+ 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
'lang_origin'
=> lang('origin'),
'lang_origin_statustext' =>
lang('Link to the origin for this request'),
***************
*** 631,636 ****
'lang_title_statustext' =>
lang('Enter request Title'),
- 'error'
=> $receipt['error'],
- 'message'
=> $receipt['message'],
'lang_descr_statustext' =>
lang('Enter a description of the request'),
'lang_descr'
=> lang('Description'),
--- 634,637 ----
***************
*** 868,873 ****
'value_title'
=> $values['title'],
- 'error'
=> $receipt['error'],
- 'message'
=> $receipt['message'],
'lang_descr'
=> lang('Description'),
'value_descr'
=> $values['descr'],
--- 869,872 ----
Index: class.uistandard_2.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uistandard_2.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** class.uistandard_2.inc.php 29 Apr 2003 12:41:31 -0000 1.10
--- class.uistandard_2.inc.php 21 May 2003 12:46:40 -0000 1.11
***************
*** 172,176 ****
! $message =
$this->bo->save($values,$action,$type);
}
--- 172,176 ----
! $receipt =
$this->bo->save($values,$action,$type);
}
***************
*** 187,191 ****
}
-
$link_data = array
(
--- 187,190 ----
***************
*** 195,221 ****
);
//_debug_array($link_data);
$data = array
(
! 'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
! 'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uistandard_2.index&type='.$type),
! 'lang_id' =>
lang('standard ID'),
! 'lang_name'
=> lang('name'),
! 'lang_descr'
=> lang('Descr'),
! 'lang_save'
=> lang('save'),
! 'lang_done'
=> lang('done'),
! 'value_id' => $id,
! 'value_name'
=> $standard['name'],
! 'value_generaladdress' =>
$standard['general_address'],
! 'message'
=> $message,
! 'lang_id_standardtext' => lang('Enter the
standard ID'),
'lang_descr_standardtext'
=> lang('Enter a description the standard'),
! 'lang_generaladdress_standardtext'=>
lang('Enter the general address'),
'lang_done_standardtext'
=> lang('Back to the list'),
'lang_save_standardtext'
=> lang('Save the standard'),
! 'type_id' =>
$standard['type_id'],
! 'location_code'
=> $standard['location_code'],
! 'value_descr'
=> $standard['descr']
!
!
);
--- 194,220 ----
);
//_debug_array($link_data);
+ $msgbox_data = $this->bocommon->msgbox_data($receipt);
+
$data = array
(
! 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
! 'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
! 'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uistandard_2.index&type='.$type),
! 'lang_id'
=> lang('standard ID'),
! 'lang_name'
=> lang('name'),
! 'lang_descr'
=> lang('Descr'),
! 'lang_save'
=> lang('save'),
! 'lang_done'
=> lang('done'),
! 'value_id'
=> $id,
! 'value_name'
=> $standard['name'],
! 'value_generaladdress'
=> $standard['general_address'],
! 'lang_id_standardtext'
=> lang('Enter the standard ID'),
'lang_descr_standardtext'
=> lang('Enter a description the standard'),
! 'lang_generaladdress_standardtext' =>
lang('Enter the general address'),
'lang_done_standardtext'
=> lang('Back to the list'),
'lang_save_standardtext'
=> lang('Save the standard'),
! 'type_id'
=> $standard['type_id'],
! 'location_code'
=> $standard['location_code'],
! 'value_descr'
=> $standard['descr']
);
Index: class.uistandard_3.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uistandard_3.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** class.uistandard_3.inc.php 29 Apr 2003 12:41:31 -0000 1.9
--- class.uistandard_3.inc.php 21 May 2003 12:46:40 -0000 1.10
***************
*** 170,175 ****
}
!
! $message =
$this->bo->save($values,$action,$type);
}
--- 170,174 ----
}
! $receipt =
$this->bo->save($values,$action,$type);
}
***************
*** 194,199 ****
--- 193,201 ----
);
//_debug_array($link_data);
+ $msgbox_data = $this->bocommon->msgbox_data($receipt);
+
$data = array
(
+ 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uistandard_3.index&type='.$type),
***************
*** 206,210 ****
'value_num'
=> $standard['num'],
'value_generaladdress' =>
$standard['general_address'],
- 'message'
=> $message,
'lang_id_standardtext' =>
lang('Enter the standard ID'),
'lang_descr_standardtext' =>
lang('Enter a description the standard'),
--- 208,211 ----
***************
*** 214,219 ****
'location_code'
=> $standard['location_code'],
'value_descr'
=> $standard['descr']
-
-
);
--- 215,218 ----
Index: class.uistandard_entity.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uistandard_entity.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** class.uistandard_entity.inc.php 29 Apr 2003 12:41:31 -0000 1.12
--- class.uistandard_entity.inc.php 21 May 2003 12:46:40 -0000 1.13
***************
*** 214,219 ****
--- 214,223 ----
);
//_debug_array($link_data);
+
+ $msgbox_data = $this->bocommon->msgbox_data($receipt);
+
$data = array
(
+ 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
'lang_prefix'
=> lang('Standard prefix'),
'lang_prefix_standardtext' =>
lang('Enter a standard prefix for the id of the equipments'),
***************
*** 230,235 ****
'value_name'
=> $standard['name'],
'value_prefix'
=> $standard['prefix'],
- 'message'
=> $receipt['message'],
- 'error'
=> $receipt['error'],
'lang_id_standardtext' =>
lang('Enter the standard ID'),
'lang_descr_standardtext' =>
lang('Enter a description of the standard'),
--- 234,237 ----
***************
*** 444,449 ****
--- 446,455 ----
);
//_debug_array($link_data);
+
+ $msgbox_data = $this->bocommon->msgbox_data($receipt);
+
$data = array
(
+ 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
'form_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
'done_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uistandard_entity.list_attribute&type='.$type.'&type_id='.$type_id),
***************
*** 457,462 ****
'value_id'
=> $id,
'value_name'
=> $attrib['name'],
- 'message'
=> $receipt['message'],
- 'error'
=> $receipt['error'],
'lang_id_attribtext' => lang('Enter
the attribute ID'),
'lang_entity_statustext' => lang('Select
a entity type'),
--- 463,466 ----
Index: class.uitemplate.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uitemplate.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** class.uitemplate.inc.php 15 May 2003 09:08:02 -0000 1.8
--- class.uitemplate.inc.php 21 May 2003 12:46:40 -0000 1.9
***************
*** 406,413 ****
$data = array
(
! 'error'
=> $receipt['error'],
! 'message'
=> $receipt['message'],
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'lang_add_statustext' =>
lang('Add the selected items'),
--- 406,414 ----
+ $msgbox_data = $this->bocommon->msgbox_data($receipt);
+
$data = array
(
! 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'lang_add_statustext' =>
lang('Add the selected items'),
***************
*** 487,492 ****
--- 488,496 ----
);
+ $msgbox_data = $this->bocommon->msgbox_data($receipt);
+
$data = array
(
+ 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uitemplate.index&template_id='
. $template_id),
***************
*** 503,508 ****
'value_descr'
=> $values['descr'],
'lang_descr_statustext' =>
lang('Enter the description for this template'),
- 'error'
=> $receipt['error'],
- 'message'
=> $receipt['message'],
'lang_done_statustext' =>
lang('Back to the list'),
'lang_save_statustext' =>
lang('Save the building'),
--- 507,510 ----
***************
*** 581,586 ****
--- 583,591 ----
);
+ $msgbox_data = $this->bocommon->msgbox_data($receipt);
+
$data = array
(
+ 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uitemplate.hour&template_id='
. $template_id),
***************
*** 605,610 ****
'value_descr'
=> $values['hours_descr'],
'lang_descr_statustext' =>
lang('Enter the description for this activity'),
- 'error'
=> $receipt['error'],
- 'message'
=> $receipt['message'],
'lang_done_statustext' =>
lang('Back to the list'),
'lang_save_statustext' =>
lang('Save the building'),
--- 610,613 ----
Index: class.uitts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uitts.inc.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** class.uitts.inc.php 13 May 2003 11:03:06 -0000 1.25
--- class.uitts.inc.php 21 May 2003 12:46:40 -0000 1.26
***************
*** 199,206 ****
}
$data = array
(
! 'message'
=> $receipt['message'],
! 'error'
=> $receipt['error'],
'autorefresh'
=> $autorefresh,
'links'
=> $links,
--- 199,207 ----
}
+ $msgbox_data = $this->bocommon->msgbox_data($receipt);
+
$data = array
(
! 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
'autorefresh'
=> $autorefresh,
'links'
=> $links,
***************
*** 271,299 ****
if ($values['save'])
{
- $errorcount = 0;
if(!$values['subject'])
{
!
$receipt['error'][$errorcount++]=array('msg'=>lang('Please type a subject for
this ticket !'));
}
if(!$values['assignedto'])
{
!
$receipt['error'][$errorcount++]=array('msg'=>lang('Please select a person to
handle the ticket !'));
}
if(!$values['cat_id'])
{
!
$receipt['error'][$errorcount++]=array('msg'=>lang('Please select a category
!'));
}
if(!$values['details'])
{
!
$receipt['error'][$errorcount++]=array('msg'=>lang('Please give som details
!'));
}
if(!$values['property_id'] &&
!$values['equipment_id'])
{
!
$receipt['error'][$errorcount++]=array('msg'=>lang('Pleace select a location -
or an equipment !'));
}
--- 272,299 ----
if ($values['save'])
{
if(!$values['subject'])
{
!
$receipt['error'][]=array('msg'=>lang('Please type a subject for this ticket
!'));
}
if(!$values['assignedto'])
{
!
$receipt['error'][]=array('msg'=>lang('Please select a person to handle the
ticket !'));
}
if(!$values['cat_id'])
{
!
$receipt['error'][]=array('msg'=>lang('Please select a category !'));
}
if(!$values['details'])
{
!
$receipt['error'][]=array('msg'=>lang('Please give som details !'));
}
if(!$values['property_id'] &&
!$values['equipment_id'])
{
!
$receipt['error'][]=array('msg'=>lang('Pleace select a location - or an
equipment !'));
}
***************
*** 316,321 ****
--- 316,324 ----
}
+ $msgbox_data = $this->bocommon->msgbox_data($receipt);
+
$data = array
(
+ 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
'location_data'
=> $location_data,
'lang_assign_to'
=> lang('Assign to'),
***************
*** 342,347 ****
'value_details'
=> $values['details'],
'value_subject'
=> $values['subject'],
- 'error'
=> $receipt['error'],
- 'message'
=> $receipt['message'],
'lang_done_statustext' =>
lang('Back to the ticket list'),
'lang_save_statustext' =>
lang('Save the ticket'),
--- 345,348 ----
***************
*** 517,523 ****
//_debug_array($ticket);
$data = array
(
!
'lang_report'
=> lang('Report'),
'lang_report_statustext' =>
lang('Link to the report originatet from this ticket'),
--- 518,526 ----
//_debug_array($ticket);
+ $msgbox_data = $this->bocommon->msgbox_data($receipt);
+
$data = array
(
! 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
'lang_report'
=> lang('Report'),
'lang_report_statustext' =>
lang('Link to the report originatet from this ticket'),
***************
*** 536,541 ****
'location_data'
=> $location_data,
- 'error'
=> $receipt['error'],
- 'message'
=> $receipt['message'],
'lang_location_code' =>
lang('Location Code'),
'lang_property_id'
=> lang('Property id'),
--- 539,542 ----
Index: class.uiwo_hour.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiwo_hour.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** class.uiwo_hour.inc.php 19 May 2003 11:04:36 -0000 1.22
--- class.uiwo_hour.inc.php 21 May 2003 12:46:40 -0000 1.23
***************
*** 231,238 ****
);
$data = array
(
! 'error'
=> $receipt['error'],
! 'message'
=> $receipt['message'],
'done_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'add_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiwo_hour.save_template&workorder_id='
. $workorder_id),
--- 231,239 ----
);
+ $msgbox_data = $this->bocommon->msgbox_data($receipt);
+
$data = array
(
! 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
'done_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'add_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiwo_hour.save_template&workorder_id='
. $workorder_id),
***************
*** 319,326 ****
);
$data = array
(
! 'error'
=> $receipt['error'],
! 'message'
=> $receipt['message'],
'link_delete'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiwo_hour.index&delete=true&workorder_id='
. $workorder_id),
'function'
=> 'index',
--- 320,328 ----
);
+ $msgbox_data = $this->bocommon->msgbox_data($receipt);
+
$data = array
(
! 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
'link_delete'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiwo_hour.index&delete=true&workorder_id='
. $workorder_id),
'function'
=> 'index',
***************
*** 574,581 ****
}
$data = array
(
! 'error'
=> $receipt['error'],
! 'message'
=> $receipt['message'],
'lang_mail'
=> lang('E-Mail'),
'lang_update_email'
=> lang('Update email'),
--- 576,584 ----
}
+ $msgbox_data = $this->bocommon->msgbox_data($receipt);
+
$data = array
(
! 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
'lang_mail'
=> lang('E-Mail'),
'lang_update_email'
=> lang('Update email'),
***************
*** 872,879 ****
$data = array
(
! 'error'
=> $receipt['error'],
! 'message'
=> $receipt['message'],
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'lang_add_statustext' =>
lang('Add the selected items'),
--- 875,883 ----
+ $msgbox_data = $this->bocommon->msgbox_data($receipt);
+
$data = array
(
! 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'lang_add_statustext' =>
lang('Add the selected items'),
***************
*** 1089,1094 ****
--- 1093,1101 ----
+ $msgbox_data = $this->bocommon->msgbox_data($receipt);
+
$data = array
(
+ 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
'lang_select_all'
=> lang('Select All'),
'img_check'
=>
$GLOBALS['phpgw']->common->get_image_path($this->currentapp).'/check.gif',
***************
*** 1096,1101 ****
'template_id'
=> $template_id,
- 'error'
=> $receipt['error'],
- 'message'
=> $receipt['message'],
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'lang_add_statustext' =>
lang('Add the selected items'),
--- 1103,1106 ----
***************
*** 1202,1207 ****
--- 1207,1215 ----
);
+ $msgbox_data = $this->bocommon->msgbox_data($receipt);
+
$data = array
(
+ 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiwo_hour.'
. $from . '&workorder_id=' . $workorder_id . '&template_id=' . $template_id),
***************
*** 1226,1231 ****
'value_descr'
=> $values['hours_descr'],
'lang_descr_statustext' =>
lang('Enter the description for this activity'),
- 'error'
=> $receipt['error'],
- 'message'
=> $receipt['message'],
'lang_done_statustext' =>
lang('Back to the list'),
'lang_save_statustext' =>
lang('Save the building'),
--- 1234,1237 ----
Index: class.uiworkorder.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiworkorder.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** class.uiworkorder.inc.php 19 May 2003 11:04:36 -0000 1.19
--- class.uiworkorder.inc.php 21 May 2003 12:46:40 -0000 1.20
***************
*** 448,454 ****
--- 448,456 ----
}
+ $msgbox_data = $this->bocommon->msgbox_data($receipt);
$data = array
(
+ 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
'calculate_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiwo_hour.index'),
'lang_calculate'
=> lang('Calculate Workorder'),
***************
*** 530,535 ****
'value_other_branch'
=> $project['other_branch'],
- 'error'
=> $receipt['error'],
- 'message'
=> $receipt['message'],
'lang_descr_statustext' =>
lang('Enter a short description of the workorder'),
'lang_descr'
=> lang('Description'),
--- 532,535 ----
Index: class.uiXport.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiXport.inc.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** class.uiXport.inc.php 9 May 2003 09:23:07 -0000 1.25
--- class.uiXport.inc.php 21 May 2003 12:46:40 -0000 1.26
***************
*** 85,122 ****
{
- $errorcount = 0;
-
if ($conv_type=='')
{
! $error[$errorcount++] =
array('msg'=>lang('Please - select a import format !'));
}
if (!$tsvfile)
{
! $error[$errorcount++] =
array('msg'=>lang('Please - select a file to import from !'));
}
if (!$art)
{
! $error[$errorcount++] =
array('msg'=>lang('Please - select type invoice!'));
}
if (!$vendor_id)
{
! $error[$errorcount++] =
array('msg'=>lang('Please - select Vendor!'));
}
if (!$type)
{
! $error[$errorcount++] =
array('msg'=>lang('Please - select type order!'));
}
if (!$budget_responsible)
{
! $error[$errorcount++] =
array('msg'=>lang('Please - select budget responsible!'));
}
if (!$this->invoice->check_vendor($vendor_id))
{
! $error[$errorcount++] =
array('msg'=>lang('That Vendor ID is not valid !'). ' : ' . $vendor_id);
}
--- 85,120 ----
{
if ($conv_type=='')
{
! $receipt['error'][] =
array('msg'=>lang('Please - select a import format !'));
}
if (!$tsvfile)
{
! $receipt['error'][] =
array('msg'=>lang('Please - select a file to import from !'));
}
if (!$art)
{
! $receipt['error'][] =
array('msg'=>lang('Please - select type invoice!'));
}
if (!$vendor_id)
{
! $receipt['error'][] =
array('msg'=>lang('Please - select Vendor!'));
}
if (!$type)
{
! $receipt['error'][] =
array('msg'=>lang('Please - select type order!'));
}
if (!$budget_responsible)
{
! $receipt['error'][] =
array('msg'=>lang('Please - select budget responsible!'));
}
if (!$this->invoice->check_vendor($vendor_id))
{
! $receipt['error'][] =
array('msg'=>lang('That Vendor ID is not valid !'). ' : ' . $vendor_id);
}
***************
*** 130,134 ****
if ($smonth && $sday && $syear)
{
! $error[$errorcount++] =
array('msg'=>lang('You have entered an invalid start date !') . ' : ' . $smonth
.'-'. $sday. '-' . $syear);
}
}
--- 128,132 ----
if ($smonth && $sday && $syear)
{
! $receipt['error'][] =
array('msg'=>lang('You have entered an invalid start date !') . ' : ' . $smonth
.'-'. $sday. '-' . $syear);
}
}
***************
*** 142,146 ****
if ($emonth && $eday && $eyear)
{
! $error[$errorcount++] =
array('msg'=>lang('You have entered an invalid end date !') . ' : ' . $emonth
.'-'. $eday. '-' . $eyear);
}
}
--- 140,144 ----
if ($emonth && $eday && $eyear)
{
! $receipt['error'][] =
array('msg'=>lang('You have entered an invalid end date !') . ' : ' . $emonth
.'-'. $eday. '-' . $eyear);
}
}
***************
*** 148,163 ****
if (!$edate && !$num_days)
{
! $error[$errorcount++] =
array('msg'=>lang('Please - select either payment date or number of days from
invoice date !'));
}
if (!file_exists($tsvfile))
{
! $error[$errorcount++] =
array('msg'=>lang('The file is empty or removed!'));
}
! if (!$error)
{
-
$dateformat =
strtolower($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
$dateformat =
str_replace(".","",$dateformat);
--- 146,160 ----
if (!$edate && !$num_days)
{
! $receipt['error'][] =
array('msg'=>lang('Please - select either payment date or number of days from
invoice date !'));
}
if (!file_exists($tsvfile))
{
! $receipt['error'][] =
array('msg'=>lang('The file is empty or removed!'));
}
! if (!$receipt['error'])
{
$dateformat =
strtolower($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
$dateformat =
str_replace(".","",$dateformat);
***************
*** 260,267 ****
$dateformat= (implode($sep,$dlarr));
$data = array
(
!
!
'links'
=> $links,
'link_calendar_invoice_date' =>
'setDateField(document.form.invoice_date);top.newWin=window.open('."'.".'/'.$this->currentapp.'/inc/calendar.html'."'".','."'".'cal'."'".','."'dependent=yes,width=210,height=230,screenX=200,screenY=300,titlebar=yes'".')',
--- 257,265 ----
$dateformat= (implode($sep,$dlarr));
+ $msgbox_data = $this->bocommon->msgbox_data($receipt);
+
$data = array
(
! 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
'links'
=> $links,
'link_calendar_invoice_date' =>
'setDateField(document.form.invoice_date);top.newWin=window.open('."'.".'/'.$this->currentapp.'/inc/calendar.html'."'".','."'".'cal'."'".','."'dependent=yes,width=210,height=230,screenX=200,screenY=300,titlebar=yes'".')',
***************
*** 271,276 ****
'dateformat'
=> $dateformat,
'lang_popup_calendar' =>
lang('Popup Calendar'),
- 'message'
=> $message,
- 'error'
=> $error,
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'cancel_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiinvoice.index&sub='.$sub),
--- 269,272 ----
***************
*** 509,522 ****
if (!$values['conv_type'] && !$values['file'] ):
{
! $receipt['error'][0]['msg']= lang('No
conversion type could be located.');
! $receipt['error'][1]['msg']=
lang('Please choose a conversion type from the list');
}
elseif($values['conv_type'] &&
!$values['file']):
{
! $message =
$this->bo->export($values['conv_type'],$values['download']);
if(!$values['download'])
{
$GLOBALS['phpgw_info']['flags']['noframework'] = True;
! echo '<pre>' .
$message[0]['msg'] . '</pre>';
echo ' <a
href="'.$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiXport.export')
. '">' . lang('Back') . '</a>';
--- 505,519 ----
if (!$values['conv_type'] && !$values['file'] ):
{
!
! $receipt['error'][] = array('msg'=>
lang('No conversion type could be located.'));
! $receipt['error'][] = array('msg'=>
lang('Please choose a conversion type from the list'));
}
elseif($values['conv_type'] &&
!$values['file']):
{
! $receipt =
$this->bo->export($values['conv_type'],$values['download']);
if(!$values['download'])
{
$GLOBALS['phpgw_info']['flags']['noframework'] = True;
! echo '<pre>' .
$receipt['message'][0]['msg'] . '</pre>';
echo ' <a
href="'.$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiXport.export')
. '">' . lang('Back') . '</a>';
***************
*** 537,544 ****
'sub' => $sub);
$data = array
(
'links'
=> $links,
- 'error'
=> $receipt['error'],
'lang_select_conv'
=> lang('Select conversion'),
'conv_list'
=> $this->bo->select_export_conv($values['conv_type']),
--- 534,543 ----
'sub' => $sub);
+ $msgbox_data = $this->bocommon->msgbox_data($receipt);
+
$data = array
(
+ 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
'links'
=> $links,
'lang_select_conv'
=> lang('Select conversion'),
'conv_list'
=> $this->bo->select_export_conv($values['conv_type']),
***************
*** 546,550 ****
'lang_conv_statustext' =>
lang('Select conversion'),
-
'lang_rollback_file' =>
lang('Roll back'),
'link_rollback_file' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiXport.rollback&sub='.$sub),
--- 545,548 ----
***************
*** 589,603 ****
if (!$values['conv_type'] && !$values['file'] ):
{
! $receipt['error'][0]['msg']= lang('No
conversion type could be located.');
! $receipt['error'][1]['msg']=
lang('Please choose a conversion type from the list');
echo ' <a
href="'.$GLOBALS['phpgw']->link('/index.php','menuaction=property.uiXport.export')
. '">' . lang('OK') . '</a>';
}
elseif($values['conv_type'] && $values['file']):
{
! $message =
$this->bo->rollback($values['conv_type'],$values['file'],$date);
}
elseif(!$values['conv_type'] &&
$values['file']):
{
!
$receipt['error'][0]['msg']=lang('Please choose a conversion type');
}
endif;
--- 587,601 ----
if (!$values['conv_type'] && !$values['file'] ):
{
! $receipt['error'][] = array('msg'=>
lang('No conversion type could be located.'));
! $receipt['error'][] = array('msg'=>
lang('Please choose a conversion type from the list'));
echo ' <a
href="'.$GLOBALS['phpgw']->link('/index.php','menuaction=property.uiXport.export')
. '">' . lang('OK') . '</a>';
}
elseif($values['conv_type'] && $values['file']):
{
! $receipt =
$this->bo->rollback($values['conv_type'],$values['file'],$date);
}
elseif(!$values['conv_type'] &&
$values['file']):
{
! $receipt['error'][] =
array('msg'=>lang('Please choose a conversion type'));
}
endif;
***************
*** 624,630 ****
--- 622,630 ----
$dateformat= (implode($sep,$dlarr));
+ $msgbox_data = $this->bocommon->msgbox_data($receipt);
$data = array
(
+ 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
'links'
=> $links,
'link_calendar_date' =>
'setDateField(document.form.date);top.newWin=window.open('."'.".'/'.$this->currentapp.'/inc/calendar.html'."'".','."'".'cal'."'".','."'dependent=yes,width=210,height=230,screenX=200,screenY=300,titlebar=yes'".')',
***************
*** 633,637 ****
'dateformat'
=> $dateformat,
'lang_popup_calendar' =>
lang('Popup Calendar'),
- 'error'
=> $receipt['error'],
'lang_select_conv'
=> lang('Select conversion'),
'conv_list'
=> $this->bo->select_export_conv($values['conv_type']),
--- 633,636 ----
***************
*** 656,660 ****
'lang_cancel'
=> lang('Cancel'),
- 'message'
=> $message,
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'lang_save'
=> lang('save')
--- 655,658 ----
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/inc class.boadmin.inc.php,1.4,1.5 class.boinvoice.inc.php,1.15,1.16class.bostandard_2.inc.php,1.2,1.3 class.bostandard_3.inc.php,1.1,1.2class.bostandard_entity.inc.php,1.8,1.9 class.boXport.inc.php,1.8,1.9 class.soadmin.inc.php,1.4,1.5 class.sobuilding.inc.php,1.10,1.11class.soinvestment.inc.php,1.11,1.12 class.soinvoice.inc.php,1.20,1.21class.sostandard_2.inc.php,1.16,1.17 class.sostandard_3.inc.php,1.3,1.4class.sostandard_entity.inc.php,1.8,1.9 class.uiadmin.inc.php,1.9,1.10 class.uiapartment.inc.php,1.10,1.11 class.uibuilding.inc.php,1.18,1.19 class.uicategory.inc.php,1.2,1.3 class.uidocument.inc.php,1.7,1.8 class.uidrawing.inc.php,1.17,1.18 class.uientrance.inc.php,1.11,1.12 class.uiequipment.inc.php,1.20,1.21 class.uigab.inc.php,1.3,1.4 class.uiinvestment.inc.php,1.17,1.18 class.uiinvoice.inc.php,1.22,1.23 class.uimeter.inc.php,1.7,1.8 class.uiowner.inc.php,1.3,1.4 class.uipricebook.inc.php,1.13,1.14 class.uiproject.inc.php,1.19,1.20 class.uiproperty.inc.php,1.22,1.23 class.uireport.inc.php,1.3,1.4 class.uirequest.inc.php,1.12,1.13class.uistandard_2.inc.php,1.10,1.11 class.uistandard_3.inc.php,1.9,1.10 class.uistandard_entity.inc.php,1.12,1.13 class.uitemplate.inc.php,1.8,1.9 class.uitts.inc.php,1.25,1.26 class.uiwo_hour.inc.php,1.22,1.23 class.uiworkorder.inc.php,1.19,1.20 class.uiXport.inc.php,1.25,1.26,
Sigurd Nes <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: property/templates/default admin.xsl,1.5,1.6 apartment.xsl,1.5,1.6 building.xsl,1.9,1.10 category.xsl,1.2,1.3 document.xsl,1.3,1.4 drawing.xsl,1.6,1.7 entrance.xsl,1.5,1.6 equipment.xsl,1.10,1.11 gab.xsl,1.2,1.3 investment.xsl,1.9,1.10 invoice.xsl,1.24,1.25 meter.xsl,1.2,1.3 pricebook.xsl,1.7,1.8 project.xsl,1.8,1.9 property.xsl,1.11,1.12 report.xsl,1.2,1.3 request.xsl,1.5,1.6 standard_2.xsl,1.4,1.5 standard_3.xsl,1.4,1.5 standard_entity.xsl,1.9,1.10 template.xsl,1.2,1.3 tts.xsl,1.8,1.9 wo_hour.xsl,1.12,1.13 workorder.xsl,1.12,1.13
- Next by Date:
[Phpgroupware-cvs] CVS: property/templates/default property_backup.xsl,1.1,NONE
- Previous by thread:
[Phpgroupware-cvs] CVS: property/templates/default admin.xsl,1.5,1.6 apartment.xsl,1.5,1.6 building.xsl,1.9,1.10 category.xsl,1.2,1.3 document.xsl,1.3,1.4 drawing.xsl,1.6,1.7 entrance.xsl,1.5,1.6 equipment.xsl,1.10,1.11 gab.xsl,1.2,1.3 investment.xsl,1.9,1.10 invoice.xsl,1.24,1.25 meter.xsl,1.2,1.3 pricebook.xsl,1.7,1.8 project.xsl,1.8,1.9 property.xsl,1.11,1.12 report.xsl,1.2,1.3 request.xsl,1.5,1.6 standard_2.xsl,1.4,1.5 standard_3.xsl,1.4,1.5 standard_entity.xsl,1.9,1.10 template.xsl,1.2,1.3 tts.xsl,1.8,1.9 wo_hour.xsl,1.12,1.13 workorder.xsl,1.12,1.13
- Next by thread:
[Phpgroupware-cvs] CVS: property/templates/default property_backup.xsl,1.1,NONE
- Index(es):