[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8368] Property: url from external sources (email)
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [8368] Property: url from external sources (email) |
|
Date: |
Mon, 19 Dec 2011 10:43:14 +0000 |
Revision: 8368
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8368
Author: sigurdne
Date: 2011-12-19 10:43:14 +0000 (Mon, 19 Dec 2011)
Log Message:
-----------
Property: url from external sources (email)
Modified Paths:
--------------
trunk/property/inc/class.boalarm.inc.php
trunk/property/inc/class.botts.inc.php
trunk/property/inc/class.uiproject.inc.php
trunk/property/inc/class.uitts.inc.php
trunk/property/inc/class.uiworkorder.inc.php
Modified: trunk/property/inc/class.boalarm.inc.php
===================================================================
--- trunk/property/inc/class.boalarm.inc.php 2011-12-19 10:42:51 UTC (rev
8367)
+++ trunk/property/inc/class.boalarm.inc.php 2011-12-19 10:43:14 UTC (rev
8368)
@@ -400,7 +400,7 @@
$body = lang('Alarm').' #'.$alarm['event_id']."\n";
$body .= lang('Name').': '.$alarm['event_name']."\n";
- $body .= '<a href ="http://' .
$GLOBALS['phpgw_info']['server']['hostname'] .
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
"property.ui{$info[0]}.edit", 'id'=> $info[1])).'">' . $alarm['event_name']
."</a>\n";
+ $body .= '<a href ="' .
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
"property.ui{$info[0]}.edit", 'id'=> $info[1]),false,true).'">' .
$alarm['event_name'] ."</a>\n";
if(!is_array($alarm['time']))
{
$dateformat =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
Modified: trunk/property/inc/class.botts.inc.php
===================================================================
--- trunk/property/inc/class.botts.inc.php 2011-12-19 10:42:51 UTC (rev
8367)
+++ trunk/property/inc/class.botts.inc.php 2011-12-19 10:43:14 UTC (rev
8368)
@@ -814,7 +814,7 @@
//-----------from--------
// build body
$body = '';
- $body .= '<a href ="http://' .
$GLOBALS['phpgw_info']['server']['hostname'] .
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'property.uitts.view', 'id' => $id)).'">' . lang('Ticket').' #' .$id
.'</a>'."\n";
+ $body .= '<a href ="' .
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'property.uitts.view', 'id' => $id),false,true).'">' . lang('Ticket').' #' .$id
.'</a>'."\n";
$body .= lang('Date Opened').': '.$entry_date."\n";
$body .= lang('Category').': '.
$this->get_category_name($ticket['cat_id']) ."\n";
// $body .= lang('Subject').': '. $ticket['subject'] ."\n";
Modified: trunk/property/inc/class.uiproject.inc.php
===================================================================
--- trunk/property/inc/class.uiproject.inc.php 2011-12-19 10:42:51 UTC (rev
8367)
+++ trunk/property/inc/class.uiproject.inc.php 2011-12-19 10:43:14 UTC (rev
8368)
@@ -1190,7 +1190,7 @@
$from_email=$GLOBALS['phpgw_info']['user']['preferences']['property']['email'];
$subject = lang(Approval).": ".
$id;
- $message = '<a href ="http://'
. $GLOBALS['phpgw_info']['server']['hostname'] .
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uiproject.edit','id'=> $id)).'">' . lang('project %1 needs
approval',$id) .'</a>';
+ $message = '<a href ="' .
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uiproject.edit','id'=> $id),false,true).'">' . lang('project %1 needs
approval',$id) .'</a>';
$bcc = '';//$from_email;
@@ -1282,7 +1282,8 @@
$from_name=$GLOBALS['phpgw_info']['user']['fullname'];
$from_email=$GLOBALS['phpgw_info']['user']['preferences']['property']['email'];
- $body = '<a href
="http://' . $GLOBALS['phpgw_info']['server']['hostname'] .
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uiproject.edit', 'id'=> $id)).'">' . lang('project %1 has been
edited',$id) .'</a>' . "\n";
+ $body = '<a href ="' .
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uiproject.edit', 'id'=> $id),false, true).'">' . lang('project %1 has
been edited',$id) .'</a>' . "\n";
+
foreach($receipt['notice_owner'] as $notice)
{
$body .=
$notice . "\n";
Modified: trunk/property/inc/class.uitts.inc.php
===================================================================
--- trunk/property/inc/class.uitts.inc.php 2011-12-19 10:42:51 UTC (rev
8367)
+++ trunk/property/inc/class.uitts.inc.php 2011-12-19 10:43:14 UTC (rev
8368)
@@ -2867,7 +2867,7 @@
$coordinator_email=$GLOBALS['phpgw_info']['user']['preferences']['property']['email'];
$subject = lang(Approval).":
".$ticket['order_id'];
- $message = '<a href ="http://' .
$GLOBALS['phpgw_info']['server']['hostname'] .
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uitts.view', 'id'=> $id)).'">' . lang('Workorder %1 needs
approval',$ticket['order_id']) .'</a>';
+ $message = '<a href ="' .
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uitts.view', 'id'=> $id),false,true).'">' . lang('Workorder %1 needs
approval',$ticket['order_id']) .'</a>';
if
(isset($GLOBALS['phpgw_info']['server']['smtp_server']) &&
$GLOBALS['phpgw_info']['server']['smtp_server'])
{
Modified: trunk/property/inc/class.uiworkorder.inc.php
===================================================================
--- trunk/property/inc/class.uiworkorder.inc.php 2011-12-19 10:42:51 UTC
(rev 8367)
+++ trunk/property/inc/class.uiworkorder.inc.php 2011-12-19 10:43:14 UTC
(rev 8368)
@@ -1037,7 +1037,7 @@
$coordinator_email=$GLOBALS['phpgw_info']['user']['preferences']['property']['email'];
$subject = lang(Approval).": ".
$id;
- $message = '<a href ="http://'
. $GLOBALS['phpgw_info']['server']['hostname'] .
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uiworkorder.edit', 'id'=> $values['project_id'])).'">' .
lang('Workorder %1 needs approval',$id) .'</a>';
+ $message = '<a href ="' .
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uiworkorder.edit', 'id'=> $id),false,true).'">' . lang('Workorder %1
needs approval',$id) .'</a>';
if
(isset($GLOBALS['phpgw_info']['server']['smtp_server']) &&
$GLOBALS['phpgw_info']['server']['smtp_server'])
{
@@ -1131,7 +1131,7 @@
$to = implode(';',$toarray);
$from_name=$GLOBALS['phpgw_info']['user']['fullname'];
$from_email=$GLOBALS['phpgw_info']['user']['preferences']['property']['email'];
- $body = '<a href ="http://' .
$GLOBALS['phpgw_info']['server']['hostname'] .
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uiworkorder.edit','id'=> $id)).'">' . lang('workorder %1 has been
edited',$id) .'</a>' . "\n";
+ $body = '<a href ="' .
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uiworkorder.edit','id'=> $id),false,true).'">' . lang('workorder %1
has been edited',$id) .'</a>' . "\n";
foreach($receipt['notice_owner'] as $notice)
{
$body .= $notice . "\n";
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8368] Property: url from external sources (email),
Sigurd Nes <=