[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/inc class.uiproject.inc.php class.uiwo...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] property/inc class.uiproject.inc.php class.uiwo... |
|
Date: |
Wed, 28 Jun 2006 20:09:31 +0000 |
CVSROOT: /sources/phpgroupware
Module name: property
Changes by: Sigurd Nes <sigurdne> 06/06/28 20:09:31
Modified files:
inc : class.uiproject.inc.php
class.uiworkorder.inc.php
Log message:
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uiproject.inc.php?cvsroot=phpgroupware&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uiworkorder.inc.php?cvsroot=phpgroupware&r1=1.24&r2=1.25
Patches:
Index: class.uiproject.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uiproject.inc.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- class.uiproject.inc.php 17 Jun 2006 08:45:56 -0000 1.27
+++ class.uiproject.inc.php 28 Jun 2006 20:09:31 -0000 1.28
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage project
- * @version $Id: class.uiproject.inc.php,v 1.27 2006/06/17 08:45:56
sigurdne Exp $
+ * @version $Id: class.uiproject.inc.php,v 1.28 2006/06/28 20:09:31
sigurdne Exp $
*/
/**
@@ -663,10 +663,12 @@
$headers = "Return-Path: <".
$from_email .">\r\n";
$headers .= "From: " .
$from_name . "<" . $from_email .">\r\n";
$headers .= "Bcc: " .
$from_name . "<" . $from_email .">\r\n";
- $headers .= "Content-type:
text/plain; charset=iso-8859-1\r\n";
+ $headers .= "Content-type:
text/html; charset=iso-8859-1\r\n";
+ $headers .= "MIME-Version:
1.0\r\n";
$subject = lang(Approval).": ".
$values['project_id'];
- $message = lang(Project) . " "
. $values['project_id'] ." ". lang('needs approval');
+ // $message = lang(Project) . " "
. $values['project_id'] ." ". lang('needs approval');
+ $message = '<a href ="http://'
. $GLOBALS['phpgw_info']['server']['hostname'] .
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.edit&id='
. $values['project_id']).'">' . lang(Project) . " " . $values['project_id'] ."
". lang('needs approval') .'</a>';
$mail_method=
$config->config_data['fmwrkorder_mail'];
if ($mail_method=='smtp'):
Index: class.uiworkorder.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uiworkorder.inc.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- class.uiworkorder.inc.php 17 Jun 2006 08:45:56 -0000 1.24
+++ class.uiworkorder.inc.php 28 Jun 2006 20:09:31 -0000 1.25
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage project
- * @version $Id: class.uiworkorder.inc.php,v 1.24 2006/06/17 08:45:56
sigurdne Exp $
+ * @version $Id: class.uiworkorder.inc.php,v 1.25 2006/06/28 20:09:31
sigurdne Exp $
*/
/**
@@ -256,7 +256,8 @@
'paid' =>
$this->paid
)
));
- }
if($uicols['name'][$i]=='workorder_id')
+ }
+ if($uicols['name'][$i]=='workorder_id')
{
$table_header[$i]['sort_link']
=true;
$table_header[$i]['sort']
= $this->nextmatchs->show_sort_order(array
@@ -356,17 +357,17 @@
$link_data = array
(
'menuaction' =>
$this->currentapp.'.uiworkorder.index',
- 'sort'
=>$this->sort,
- 'order'
=>$this->order,
- 'cat_id'
=>$this->cat_id,
- 'district_id'
=>$this->district_id,
- 'status_id'
=>$this->status_id,
- 'filter'
=>$this->filter,
- 'query'
=>$this->query,
- 'search_vendor'
=>$this->search_vendor,
- 'start_date'
=>$start_date,
- 'end_date'
=>$end_date,
- 'wo_hour_cat_id'
=>$this->wo_hour_cat_id,
+ 'sort' =>
$this->sort,
+ 'order' =>
$this->order,
+ 'cat_id' =>
$this->cat_id,
+ 'district_id' =>
$this->district_id,
+ 'status_id' =>
$this->status_id,
+ 'filter' =>
$this->filter,
+ 'query' =>
$this->query,
+ 'search_vendor' =>
$this->search_vendor,
+ 'start_date' =>
$start_date,
+ 'end_date' =>
$end_date,
+ 'wo_hour_cat_id' =>
$this->wo_hour_cat_id,
'b_group' =>
$this->b_group,
'paid' =>
$this->paid
);
@@ -376,18 +377,18 @@
$link_excel = array
(
'menuaction' =>
$this->currentapp.'.uiworkorder.excel',
- 'sort'
=>$this->sort,
- 'order'
=>$this->order,
- 'cat_id'
=>$this->cat_id,
- 'district_id'
=>$this->district_id,
- 'status_id'
=>$this->status_id,
- 'filter'
=>$this->filter,
- 'query'
=>$this->query,
- 'search_vendor'
=>$this->search_vendor,
- 'start_date'
=>$start_date,
- 'end_date'
=>$end_date,
- 'start'
=>$this->start,
- 'wo_hour_cat_id'
=>$this->wo_hour_cat_id,
+ 'sort' =>
$this->sort,
+ 'order' =>
$this->order,
+ 'cat_id' =>
$this->cat_id,
+ 'district_id' =>
$this->district_id,
+ 'status_id' =>
$this->status_id,
+ 'filter' =>
$this->filter,
+ 'query' =>
$this->query,
+ 'search_vendor' =>
$this->search_vendor,
+ 'start_date' =>
$start_date,
+ 'end_date' =>
$end_date,
+ 'start' =>
$this->start,
+ 'wo_hour_cat_id' =>
$this->wo_hour_cat_id,
'b_group' =>
$this->b_group,
'paid' =>
$this->paid
);
@@ -548,10 +549,12 @@
$headers = "Return-Path: <".
$coordinator_email .">\r\n";
$headers .= "From: " .
$coordinator_name . "<" . $coordinator_email .">\r\n";
$headers .= "Bcc: " .
$coordinator_name . "<" . $coordinator_email .">\r\n";
- $headers .= "Content-type:
text/plain; charset=iso-8859-1\r\n";
+ $headers .= "Content-type:
text/html; charset=iso-8859-1\r\n";
+ $headers .= "MIME-Version:
1.0\r\n";
$subject = lang(Approval).": ".
$values['workorder_id'];
- $message = lang('Workorder %1
needs approval',$values['workorder_id']);
+ // $message = lang('Workorder %1
needs approval',$values['workorder_id']);
+ $message = '<a href ="http://'
. $GLOBALS['phpgw_info']['server']['hostname'] .
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.edit&id='
. $values['project_id']).'">' . lang('Workorder %1 needs
approval',$values['workorder_id'] .'</a>';
$mail_method=
$config->config_data['fmwrkorder_mail'];
if ($mail_method=='smtp'):
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/inc class.uiproject.inc.php class.uiwo...,
Sigurd Nes <=