[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [17576] adapt to new phpmailer
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [17576] adapt to new phpmailer |
|
Date: |
Sun, 14 Jan 2018 05:45:17 -0500 (EST) |
Revision: 17576
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17576
Author: sigurdne
Date: 2018-01-14 05:45:16 -0500 (Sun, 14 Jan 2018)
Log Message:
-----------
adapt to new phpmailer
Modified Paths:
--------------
trunk/activitycalendar/inc/class.uiactivities.inc.php
trunk/booking/inc/class.async_task_send_reminder.inc.php
trunk/booking/inc/class.boallocation.inc.php
trunk/booking/inc/class.boapplication.inc.php
trunk/booking/inc/class.bobooking.inc.php
trunk/booking/inc/class.boevent.inc.php
trunk/booking/inc/class.uiallocation.inc.php
trunk/booking/inc/class.uibooking.inc.php
trunk/booking/inc/class.uievent.inc.php
trunk/booking/inc/class.uisend_email.inc.php
trunk/booking/templates/base/application.xsl
trunk/bookingfrontend/inc/class.uiapplication.inc.php
trunk/controller/inc/class.uicheck_list.inc.php
trunk/eventplanner/inc/class.bobooking.inc.php
trunk/eventplanner/inc/class.bocalendar.inc.php
trunk/helpdesk/inc/class.botts.inc.php
trunk/helpdesk/setup/phpgw_no.lang
trunk/phpgwapi/inc/class.send.inc.php
trunk/property/inc/class.boevent.inc.php
trunk/property/inc/class.botts.inc.php
trunk/property/inc/class.boworkorder.inc.php
trunk/property/inc/cron/default/Import_fra_agresso_X205.php
trunk/property/inc/cron/default/import_oppdatering_av_bestilling_fra_agresso_bkb.php
trunk/property/inc/custom/default/varsle_prosjektoordinator_ved_avsluttet_relatert_melding_BBB.php
Modified: trunk/activitycalendar/inc/class.uiactivities.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.uiactivities.inc.php 2018-01-14
10:44:22 UTC (rev 17575)
+++ trunk/activitycalendar/inc/class.uiactivities.inc.php 2018-01-14
10:45:16 UTC (rev 17576)
@@ -1271,7 +1271,7 @@
{
$GLOBALS['phpgw']->send->msg('email',
$mailtoAddress, $subject, $body, '', '', '', $from, '', 'html');
}
- catch (phpmailerException $e)
+ catch (Exception $e)
{
if ($e)
{
@@ -1334,7 +1334,7 @@
{
$GLOBALS['phpgw']->send->msg('email',
$mailtoAddress, $subject, $body, '', '', '', $from, '', 'html');
}
- catch (phpmailerException $e)
+ catch (Exception $e)
{
if ($e)
{
Modified: trunk/booking/inc/class.async_task_send_reminder.inc.php
===================================================================
--- trunk/booking/inc/class.async_task_send_reminder.inc.php 2018-01-14
10:44:22 UTC (rev 17575)
+++ trunk/booking/inc/class.async_task_send_reminder.inc.php 2018-01-14
10:45:16 UTC (rev 17576)
@@ -65,7 +65,7 @@
$sql = "update bb_booking set
reminder = 3 where id = " . $booking['id'];
$this->db->query($sql);
}
- catch (phpmailerException $e)
+ catch (Exception $e)
{
// do nothing. nowhere to log
or display error messages
}
@@ -103,7 +103,7 @@
$sql = "update bb_event set reminder =
3 where id = " . $event['id'];
$this->db->query($sql);
}
- catch (phpmailerException $e)
+ catch (Exception $e)
{
// do nothing. nowhere to log or
display error messages
}
Modified: trunk/booking/inc/class.boallocation.inc.php
===================================================================
--- trunk/booking/inc/class.boallocation.inc.php 2018-01-14 10:44:22 UTC
(rev 17575)
+++ trunk/booking/inc/class.boallocation.inc.php 2018-01-14 10:45:16 UTC
(rev 17576)
@@ -81,7 +81,7 @@
{
$send->msg('email', $adr, $subject,
$body, '', '', '', $from, '', 'html');
}
- catch (phpmailerException $e)
+ catch (Exception $e)
{
// TODO: Inform user if something goes
wrong
}
@@ -166,7 +166,7 @@
{
$send->msg('email', $adr, $subject,
$body, '', '', '', $from, '', 'html');
}
- catch (phpmailerException $e)
+ catch (Exception $e)
{
// TODO: Inform user if something goes
wrong
}
Modified: trunk/booking/inc/class.boapplication.inc.php
===================================================================
--- trunk/booking/inc/class.boapplication.inc.php 2018-01-14 10:44:22 UTC
(rev 17575)
+++ trunk/booking/inc/class.boapplication.inc.php 2018-01-14 10:45:16 UTC
(rev 17576)
@@ -115,7 +115,7 @@
{
$send->msg('email', $bemail, $bsubject, $bbody, '', '', '', $from, '', 'html');
}
- catch
(phpmailerException $e)
+ catch (Exception $e)
{
// TODO: Inform
user if something goes wrong
}
@@ -145,7 +145,7 @@
{
$send->msg('email',
$application['contact_email'], $subject, $body, '', '', '', $from, '', 'html');
}
- catch (phpmailerException $e)
+ catch (Exception $e)
{
// TODO: Inform user if something goes wrong
}
@@ -157,7 +157,9 @@
function send_admin_notification( $application, $message = null
)
{
if
(!(isset($GLOBALS['phpgw_info']['server']['smtp_server']) &&
$GLOBALS['phpgw_info']['server']['smtp_server']))
- return;
+ {
+// return;
+ }
$send = CreateObject('phpgwapi.send');
$config = CreateObject('phpgwapi.config', 'booking');
@@ -173,9 +175,13 @@
$mailadresses = explode("\n", $mailadresses);
if ($GLOBALS['phpgw_info']['server']['webserver_url']
!= '' && isset($config->config_data['external_site_address']))
+ {
$link = $external_site_address .
$GLOBALS['phpgw_info']['server']['webserver_url'] .
'/index.php?menuaction=booking.uiapplication.show&id=' . $application['id'];
+ }
else
+ {
$link = $external_site_address .
'/index.php?menuaction=booking.uiapplication.show&id=' . $application['id'];
+ }
$activity =
$this->activity_bo->read_single($application['activity_id']);
@@ -203,7 +209,7 @@
{
$send->msg('email', $adr, $subject,
$body, '', '', '', $from, '', 'html');
}
- catch (phpmailerException $e)
+ catch (Exception $e)
{
// TODO: Inform user if something goes
wrong
}
Modified: trunk/booking/inc/class.bobooking.inc.php
===================================================================
--- trunk/booking/inc/class.bobooking.inc.php 2018-01-14 10:44:22 UTC (rev
17575)
+++ trunk/booking/inc/class.bobooking.inc.php 2018-01-14 10:45:16 UTC (rev
17576)
@@ -158,7 +158,7 @@
{
$send->msg('email', $adr, $subject,
$body, '', '', '', $from, '', 'html');
}
- catch (phpmailerException $e)
+ catch (Exception $e)
{
// TODO: Inform user if something goes
wrong
}
@@ -287,7 +287,7 @@
{
$send->msg('email', $adr, $subject,
$body, '', '', '', $from, '', 'html');
}
- catch (phpmailerException $e)
+ catch (Exception $e)
{
// TODO: Inform user if something goes
wrong
}
Modified: trunk/booking/inc/class.boevent.inc.php
===================================================================
--- trunk/booking/inc/class.boevent.inc.php 2018-01-14 10:44:22 UTC (rev
17575)
+++ trunk/booking/inc/class.boevent.inc.php 2018-01-14 10:45:16 UTC (rev
17576)
@@ -164,7 +164,7 @@
{
$send->msg('email', $adr, $subject,
$body, '', '', '', $from, '', 'html');
}
- catch (phpmailerException $e)
+ catch (Exception $e)
{
// TODO: Inform user if something goes
wrong
}
@@ -252,7 +252,7 @@
{
$send->msg('email', $adr, $subject,
$body, '', '', '', $from, '', 'html');
}
- catch (phpmailerException $e)
+ catch (Exception $e)
{
// TODO: Inform user if something goes
wrong
}
Modified: trunk/booking/inc/class.uiallocation.inc.php
===================================================================
--- trunk/booking/inc/class.uiallocation.inc.php 2018-01-14 10:44:22 UTC
(rev 17575)
+++ trunk/booking/inc/class.uiallocation.inc.php 2018-01-14 10:45:16 UTC
(rev 17576)
@@ -558,7 +558,7 @@
{
$send->msg('email',
$contact['email'], $subject, $body, '', '', '', $from, '', 'html');
}
- catch (phpmailerException $e)
+ catch (Exception $e)
{
}
Modified: trunk/booking/inc/class.uibooking.inc.php
===================================================================
--- trunk/booking/inc/class.uibooking.inc.php 2018-01-14 10:44:22 UTC (rev
17575)
+++ trunk/booking/inc/class.uibooking.inc.php 2018-01-14 10:45:16 UTC (rev
17576)
@@ -704,7 +704,7 @@
{
$send->msg('email',
$contact['email'], $subject, $body, '', '', '', $from, '', 'html');
}
- catch (phpmailerException $e)
+ catch (Exception $e)
{
}
Modified: trunk/booking/inc/class.uievent.inc.php
===================================================================
--- trunk/booking/inc/class.uievent.inc.php 2018-01-14 10:44:22 UTC (rev
17575)
+++ trunk/booking/inc/class.uievent.inc.php 2018-01-14 10:45:16 UTC (rev
17576)
@@ -617,7 +617,7 @@
{
$send->msg('email', $receiver,
$subject, $body, '', '', '', $from, '', 'html');
}
- catch (phpmailerException $e)
+ catch (Exception $e)
{
// TODO: Inform user if something goes
wrong
}
Modified: trunk/booking/inc/class.uisend_email.inc.php
===================================================================
--- trunk/booking/inc/class.uisend_email.inc.php 2018-01-14 10:44:22 UTC
(rev 17575)
+++ trunk/booking/inc/class.uisend_email.inc.php 2018-01-14 10:45:16 UTC
(rev 17576)
@@ -129,7 +129,7 @@
$send->msg('email', $contact['email'],
$subject, $body, '', '', '', $from, '', 'html');
$result['ok'][] = $contact;
}
- catch (phpmailerException $e)
+ catch (Exception $e)
{
$result['failed'][] = $contact;
}
Modified: trunk/booking/templates/base/application.xsl
===================================================================
--- trunk/booking/templates/base/application.xsl 2018-01-14 10:44:22 UTC
(rev 17575)
+++ trunk/booking/templates/base/application.xsl 2018-01-14 10:45:16 UTC
(rev 17576)
@@ -219,7 +219,7 @@
<xsl:value-of select="php:function('lang', 'Description')" />
</label>
<span>
-
<xsl:value-of select="application/description"/>
+
<xsl:value-of select="application/description" disable-output-escaping="yes"/>
</span>
</div>
<div
class="pure-control-group">
@@ -228,7 +228,7 @@
<xsl:value-of select="php:function('lang', 'Extra info')" />
</h4>
</label>
- <xsl:value-of
select="application/equipment"/>
+ <xsl:value-of
select="application/equipment" disable-output-escaping="yes"/>
</div>
</div>
Modified: trunk/bookingfrontend/inc/class.uiapplication.inc.php
===================================================================
--- trunk/bookingfrontend/inc/class.uiapplication.inc.php 2018-01-14
10:44:22 UTC (rev 17575)
+++ trunk/bookingfrontend/inc/class.uiapplication.inc.php 2018-01-14
10:45:16 UTC (rev 17576)
@@ -27,12 +27,14 @@
$this->redirect(array('menuaction' =>
'bookingfrontend.uisearch.index'));
}
- if ($_SERVER['REQUEST_METHOD'] == 'POST' &&
$_POST['comment'])
+ $comment = phpgw::get_var('comment', 'string', 'POST');
+
+ if ($_SERVER['REQUEST_METHOD'] == 'POST' && $comment)
{
- $this->add_comment($application,
$_POST['comment']);
+ $this->add_comment($application, $comment);
$this->set_display_in_dashboard($application,
true, array('force' => true));
$application['frontend_modified'] = 'now';
-
$this->bo->send_admin_notification($application, $_POST['comment']);
+
$this->bo->send_admin_notification($application, $comment);
$receipt = $this->bo->update($application);
$this->redirect(array('menuaction' =>
$this->url_prefix . '.show', 'id' => $application['id'],
Modified: trunk/controller/inc/class.uicheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.uicheck_list.inc.php 2018-01-14 10:44:22 UTC
(rev 17575)
+++ trunk/controller/inc/class.uicheck_list.inc.php 2018-01-14 10:45:16 UTC
(rev 17576)
@@ -2125,7 +2125,7 @@
{
$mail->Send();
}
- catch (phpmailerException $e)
+ catch (Exception $e)
{
phpgwapi_cache::message_set($e->getMessage(),
'error');
}
@@ -2139,7 +2139,7 @@
{
$rc = $send->msg('email', $to_address,
$subject, $message, $msgtype = 'Ical', $cc = '', $bcc = '', $from_address,
$from_name, 'html', $mime_boundary);//, array($attachment));
}
- catch (phpmailerException $e)
+ catch (Exception $e)
{
phpgwapi_cache::message_set($e->getMessage(), 'error');
}
Modified: trunk/eventplanner/inc/class.bobooking.inc.php
===================================================================
--- trunk/eventplanner/inc/class.bobooking.inc.php 2018-01-14 10:44:22 UTC
(rev 17575)
+++ trunk/eventplanner/inc/class.bobooking.inc.php 2018-01-14 10:45:16 UTC
(rev 17576)
@@ -282,7 +282,7 @@
{
$rcpt = $send->msg('email', $to_email,
$subject, stripslashes($content), '', $cc, $bcc, $from_email, $from_name,
'html');
}
- catch (phpmailerException $e)
+ catch (Exception $e)
{
phpgwapi_cache::message_set($e->getMessage(),
'error');
}
Modified: trunk/eventplanner/inc/class.bocalendar.inc.php
===================================================================
--- trunk/eventplanner/inc/class.bocalendar.inc.php 2018-01-14 10:44:22 UTC
(rev 17575)
+++ trunk/eventplanner/inc/class.bocalendar.inc.php 2018-01-14 10:45:16 UTC
(rev 17576)
@@ -403,7 +403,7 @@
{
$rcpt = $send->msg('email',
$entry['to_email'], $entry['subject'], $entry['content'], '', $entry['cc'],
$entry['bcc'], $entry['from_email'], $entry['from_name'], 'html');
}
- catch (phpmailerException $e)
+ catch (Exception $e)
{
phpgwapi_cache::message_set($e->getMessage(), 'error');
}
Modified: trunk/helpdesk/inc/class.botts.inc.php
===================================================================
--- trunk/helpdesk/inc/class.botts.inc.php 2018-01-14 10:44:22 UTC (rev
17575)
+++ trunk/helpdesk/inc/class.botts.inc.php 2018-01-14 10:45:16 UTC (rev
17576)
@@ -1135,7 +1135,7 @@
{
$rc = $this->send->msg('email',
$to, $subject, $html, '', $cc,
$bcc,$current_user_address,$GLOBALS['phpgw_info']['user']['fullname'],'html');
}
- catch (phpmailerException $e)
+ catch (Exception $e)
{
$receipt['error'][] =
array('msg' => $e->getMessage());
}
Modified: trunk/helpdesk/setup/phpgw_no.lang
===================================================================
--- trunk/helpdesk/setup/phpgw_no.lang 2018-01-14 10:44:22 UTC (rev 17575)
+++ trunk/helpdesk/setup/phpgw_no.lang 2018-01-14 10:45:16 UTC (rev 17576)
@@ -220,4 +220,5 @@
ticket is forwarded helpdesk no Melding er videresendt
email_create_account_title helpdesk no LRS systemtilgang
email_create_account_message helpdesk no Systemmelding fra LRS
til %1 %2:<br/>Det er opprettet en tilgang for deg i LRS<br/><br/>Du får
tilgang til systemet via kommunens intranett.<br/>Under verktøy i høyre
kolonne, velg fra LRS listen.<br/>Brukerveiledning finner du i systemet, ved å
velge "Hjelp" i toppmenyen.<br/>Har du spørsmål send en e-post til LRS
brukerstøtte.<br/>
-choose a section from the menu helpdesk no Velg en avdeling fra
menyen
\ No newline at end of file
+choose a section from the menu helpdesk no Velg en avdeling fra
menyen
+please enter value for attribute %1 helpdesk no Venligst angi
verdi for feltet %1
\ No newline at end of file
Modified: trunk/phpgwapi/inc/class.send.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.send.inc.php 2018-01-14 10:44:22 UTC (rev
17575)
+++ trunk/phpgwapi/inc/class.send.inc.php 2018-01-14 10:45:16 UTC (rev
17576)
@@ -60,12 +60,22 @@
}
}
+ $ret = false;
switch( $service )
{
case 'email':
- return $this->send_email($to, $subject,
$body, $msgtype, $cc, $bcc, $from, $sender, $content_type, $boundary,
$attachments, $receive_notification);
- break;
+ try
+ {
+ $ret = $this->send_email($to,
$subject, $body, $msgtype, $cc, $bcc, $from, $sender, $content_type, $boundary,
$attachments, $receive_notification);
+ }
+ catch (Exception $e)
+ {
+ throw $e;
+ return false;
+ }
+ break;
}
+ return $ret;
}
function send_email($to, $subject, $body, $msgtype, $cc, $bcc,
$from, $sender, $content_type, $boundary,$attachments, $receive_notification)
@@ -89,19 +99,27 @@
$delimiter = ';';
$to = explode($delimiter, $to);
- foreach ($to as $entry)
+ try
{
- $entry =
str_replace(array('[',']'),array('<','>'),$entry);
- $to_array = explode('<', $entry);
- if ( count($to_array) == 2 )
+ foreach ($to as $entry)
{
-
$mail->AddAddress(trim($to_array[1],'>'), $to_array[0]);
+ $entry =
str_replace(array('[',']'),array('<','>'),$entry);
+ $to_array = explode('<', $entry);
+ if ( count($to_array) == 2 )
+ {
+
$mail->AddAddress(trim($to_array[1],'>'), $to_array[0]);
+ }
+ else
+ {
+ $mail->AddAddress($to_array[0]);
+ }
}
- else
- {
- $mail->AddAddress($to_array[0]);
- }
}
+ catch (Exception $e)
+ {
+ throw $e;
+ return false;
+ }
if($cc)
{
Modified: trunk/property/inc/class.boevent.inc.php
===================================================================
--- trunk/property/inc/class.boevent.inc.php 2018-01-14 10:44:22 UTC (rev
17575)
+++ trunk/property/inc/class.boevent.inc.php 2018-01-14 10:45:16 UTC (rev
17576)
@@ -616,7 +616,7 @@
{
$GLOBALS['phpgw']->send->msg('email',
$_address, $subject, stripslashes($message), '', $cc, $bcc, $coordinator_email,
$coordinator_name, 'html');
}
- catch (phpmailerException $e)
+ catch (Exception $e)
{
$receipt['error'][] = array('msg' =>
$e->getMessage());
$GLOBALS['phpgw']->log->error(array(
Modified: trunk/property/inc/class.botts.inc.php
===================================================================
--- trunk/property/inc/class.botts.inc.php 2018-01-14 10:44:22 UTC (rev
17575)
+++ trunk/property/inc/class.botts.inc.php 2018-01-14 10:45:16 UTC (rev
17576)
@@ -1534,7 +1534,7 @@
{
$rc = $this->send->msg('email',
$to, $subject, $html, '', $cc, $bcc, $current_user_address,
$GLOBALS['phpgw_info']['user']['fullname'], 'html');
}
- catch (phpmailerException $e)
+ catch (Exception $e)
{
$receipt['error'][] =
array('msg' => $e->getMessage());
}
Modified: trunk/property/inc/class.boworkorder.inc.php
===================================================================
--- trunk/property/inc/class.boworkorder.inc.php 2018-01-14 10:44:22 UTC
(rev 17575)
+++ trunk/property/inc/class.boworkorder.inc.php 2018-01-14 10:45:16 UTC
(rev 17576)
@@ -1001,7 +1001,7 @@
{
$ok =
$GLOBALS['phpgw']->send->msg('email', $to, $subject, $body, false, $cc, $bcc,
$from_email, $from_name, 'html');
}
- catch (phpmailerException $e)
+ catch (Exception $e)
{
phpgwapi_cache::message_set($e->getMessage(), 'error');
}
Modified: trunk/property/inc/cron/default/Import_fra_agresso_X205.php
===================================================================
--- trunk/property/inc/cron/default/Import_fra_agresso_X205.php 2018-01-14
10:44:22 UTC (rev 17575)
+++ trunk/property/inc/cron/default/Import_fra_agresso_X205.php 2018-01-14
10:45:16 UTC (rev 17576)
@@ -267,7 +267,7 @@
{
$rc =
$this->send->msg('email', $prefs['email'], $subject, stripslashes($body), '',
'', '', $from, '', 'html');
}
- catch (phpmailerException $e)
+ catch (Exception $e)
{
$this->receipt['error'][] = array('msg' => $e->getMessage());
}
@@ -590,7 +590,7 @@
$this->receipt['message'][] = array('msg' => "epost sendt til {$to}");
}
}
- catch (phpmailerException $e)
+ catch (Exception $e)
{
$this->receipt['error'][] = array('msg' => $e->getMessage());
}
@@ -681,7 +681,7 @@
{
$rc =
$this->send->msg('email', $to, $subject, stripslashes($body), '', $cc, $bcc,
$from, '', 'html');
}
- catch (phpmailerException $e)
+ catch (Exception $e)
{
$this->receipt['error'][] = array('msg' => $e->getMessage());
}
Modified:
trunk/property/inc/cron/default/import_oppdatering_av_bestilling_fra_agresso_bkb.php
===================================================================
---
trunk/property/inc/cron/default/import_oppdatering_av_bestilling_fra_agresso_bkb.php
2018-01-14 10:44:22 UTC (rev 17575)
+++
trunk/property/inc/cron/default/import_oppdatering_av_bestilling_fra_agresso_bkb.php
2018-01-14 10:45:16 UTC (rev 17576)
@@ -393,7 +393,7 @@
{
$rc = $this->send->msg('email',
$prefs['email'], $subject, stripslashes($body), '', '', '', $from, '', 'html');
}
- catch (phpmailerException $e)
+ catch (Exception $e)
{
$this->receipt['error'][] = array('msg'
=> $e->getMessage());
}
@@ -424,7 +424,7 @@
{
$rc = $this->send->msg('email', $to,
$subject, $body, '', $cc, $bcc, $from, '', 'html');
}
- catch (phpmailerException $e)
+ catch (Exception $e)
{
$this->receipt['error'][] = array('msg'
=> $e->getMessage());
}
Modified:
trunk/property/inc/custom/default/varsle_prosjektoordinator_ved_avsluttet_relatert_melding_BBB.php
===================================================================
---
trunk/property/inc/custom/default/varsle_prosjektoordinator_ved_avsluttet_relatert_melding_BBB.php
2018-01-14 10:44:22 UTC (rev 17575)
+++
trunk/property/inc/custom/default/varsle_prosjektoordinator_ved_avsluttet_relatert_melding_BBB.php
2018-01-14 10:45:16 UTC (rev 17576)
@@ -87,7 +87,7 @@
{
$rcpt =
$GLOBALS['phpgw']->send->msg('email', $_to, $subject, stripslashes($body), '',
$cc, $bcc, $from_email, $from_name, 'html', '');
}
- catch (phpmailerException $e)
+ catch (Exception $e)
{
$receipt['error'][] = array('msg' =>
$e->getMessage());
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [17576] adapt to new phpmailer,
sigurdne <=